Add NetworkHandler to own network handlers in src/chromeos/network

ash/system/chromeos/network/network_state_notifier_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/chromeos/network/network_state_notifier.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
 #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_state_handler.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace {
 
 ash::SystemTray* GetSystemTray() {
   return ash::Shell::GetPrimaryRootWindowController()->shelf()->
       status_area_widget()->system_tray();
 }
 
 }  // namespace
 
+using chromeos::DBusThreadManager;
+using chromeos::NetworkHandler;
 using chromeos::NetworkStateHandler;
-using chromeos::DBusThreadManager;
 using chromeos::ShillDeviceClient;
 using chromeos::ShillServiceClient;
 
 namespace ash {
 namespace test {
 
 using internal::NetworkStateNotifier;
 
 class NetworkStateNotifierTest : public AshTestBase {
  public:
   NetworkStateNotifierTest() {}
   virtual ~NetworkStateNotifierTest() {}
 
   virtual void SetUp() OVERRIDE {
     DBusThreadManager::InitializeWithStub();
     SetupDefaultShillState();
-    NetworkStateHandler::Initialize();
+    NetworkHandler::Initialize();
     RunAllPendingInMessageLoop();
     AshTestBase::SetUp();
   }
 
   virtual void TearDown() OVERRIDE {
     AshTestBase::TearDown();
-    NetworkStateHandler::Shutdown();
+    NetworkHandler::Shutdown();
     DBusThreadManager::Shutdown();
   }
 
  protected:
   void SetupDefaultShillState() {
     RunAllPendingInMessageLoop();
     ShillDeviceClient::TestInterface* device_test =
         DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface();
     device_test->ClearDevices();
     device_test->AddDevice("/device/stub_wifi_device1",
@@ skipping 25 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifierTest);
 };
 
 TEST_F(NetworkStateNotifierTest, ConnectionFailure) {
   EXPECT_FALSE(GetSystemTray()->HasNotificationBubble());
   // State -> Failure for non connecting network should not spawn a notification
   SetServiceState("wifi1", flimflam::kStateFailure);
   EXPECT_FALSE(GetSystemTray()->CloseNotificationBubbleForTest());
   // State -> Failure for connecting network should spawn a notification
   SetServiceState("wifi1", flimflam::kStateAssociation);
-  NetworkStateHandler::Get()->SetConnectingNetwork("wifi1");
+  NetworkHandler::Get()->network_state_handler()->SetConnectingNetwork("wifi1");
   SetServiceState("wifi1", flimflam::kStateFailure);
   EXPECT_TRUE(GetSystemTray()->CloseNotificationBubbleForTest());
   // Failure -> Idle should not spawn a notification
   SetServiceState("wifi1", flimflam::kStateIdle);
   EXPECT_FALSE(GetSystemTray()->HasNotificationBubble());
   // Idle  -> Failure should also not spawn a notification
   SetServiceState("wifi1", flimflam::kStateFailure);
   EXPECT_FALSE(GetSystemTray()->HasNotificationBubble());
 }
 
 }  // namespace test
 }  // namespace ash