Update chromium to branch 1599.

Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/chromium/ash/system/chromeos/network/network_state_notifier_unittest.cc b/chromium/ash/system/chromeos/network/network_state_notifier_unittest.cc
index d8d036ad653..6e2069deb65 100644
--- a/chromium/ash/system/chromeos/network/network_state_notifier_unittest.cc
+++ b/chromium/ash/system/chromeos/network/network_state_notifier_unittest.cc
@@ -14,6 +14,7 @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_service_client.h"
+#include "chromeos/network/network_connection_handler.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace {
@@ -26,6 +27,8 @@ ash::SystemTray* GetSystemTray() {
 }  // namespace
 
 using chromeos::DBusThreadManager;
+using chromeos::NetworkHandler;
+using chromeos::NetworkConnectionHandler;
 using chromeos::ShillDeviceClient;
 using chromeos::ShillServiceClient;
 
@@ -40,12 +43,14 @@ class NetworkStateNotifierTest : public AshTestBase {
   virtual void SetUp() OVERRIDE {
     DBusThreadManager::InitializeWithStub();
     SetupDefaultShillState();
+    NetworkHandler::Initialize();
     RunAllPendingInMessageLoop();
     AshTestBase::SetUp();
   }
 
   virtual void TearDown() OVERRIDE {
     AshTestBase::TearDown();
+    NetworkHandler::Shutdown();
     DBusThreadManager::Shutdown();
   }