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

chromeos/network/managed_network_configuration_handler_unittest.cc

 // Copyright (c) 2013 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 "chromeos/network/managed_network_configuration_handler.h"
 
 #include <iostream>
 #include <sstream>
 
 #include "base/message_loop.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/mock_dbus_thread_manager.h"
 #include "chromeos/dbus/mock_shill_manager_client.h"
 #include "chromeos/dbus/mock_shill_profile_client.h"
 #include "chromeos/dbus/mock_shill_service_client.h"
 #include "chromeos/dbus/shill_profile_client_stub.h"
 #include "chromeos/network/network_configuration_handler.h"
-#include "chromeos/network/network_profile_handler_stub.h"
+#include "chromeos/network/network_profile_handler.h"
 #include "chromeos/network/onc/onc_test_utils.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "dbus/object_path.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
+using ::testing::AnyNumber;
 using ::testing::Invoke;
 using ::testing::Mock;
 using ::testing::Pointee;
 using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::StrEq;
 using ::testing::StrictMock;
 using ::testing::_;
 
 namespace test_utils = ::chromeos::onc::test_utils;
@@ skipping 86 matching lines @@
     entries->GetDictionaryWithoutPathExpansion(entry_path, &entry);
     ASSERT_TRUE(entry);
     callback.Run(*entry);
   }
 
  protected:
   base::DictionaryValue profile_entries_;
   std::map<std::string, std::string> profile_to_user_;
 };
 
+class TestNetworkProfileHandler : public NetworkProfileHandler {
+ public:
+  TestNetworkProfileHandler() {}
+  virtual ~TestNetworkProfileHandler() {}
+
+  void AddProfileForTest(const NetworkProfile& profile) {
+    AddProfile(profile);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestNetworkProfileHandler);
+};
+
 }  // namespace
 
 class ManagedNetworkConfigurationHandlerTest : public testing::Test {
  public:
   ManagedNetworkConfigurationHandlerTest() {
   }
 
   virtual ~ManagedNetworkConfigurationHandlerTest() {
   }
 
   virtual void SetUp() OVERRIDE {
     MockDBusThreadManager* dbus_thread_manager = new MockDBusThreadManager;
     EXPECT_CALL(*dbus_thread_manager, GetSystemBus())
         .WillRepeatedly(Return(static_cast<dbus::Bus*>(NULL)));
     DBusThreadManager::InitializeForTesting(dbus_thread_manager);
 
+    SetNetworkConfigurationHandlerExpectations();
+
     EXPECT_CALL(*dbus_thread_manager, GetShillManagerClient())
         .WillRepeatedly(Return(&mock_manager_client_));
     EXPECT_CALL(*dbus_thread_manager, GetShillServiceClient())
         .WillRepeatedly(Return(&mock_service_client_));
     EXPECT_CALL(*dbus_thread_manager, GetShillProfileClient())
         .WillRepeatedly(Return(&mock_profile_client_));
 
     ON_CALL(mock_profile_client_, GetProperties(_,_,_))
         .WillByDefault(Invoke(&profiles_stub_,
                               &ShillProfileTestClient::GetProperties));
 
     ON_CALL(mock_profile_client_, GetEntry(_,_,_,_))
         .WillByDefault(Invoke(&profiles_stub_,
                               &ShillProfileTestClient::GetEntry));
 
-    NetworkConfigurationHandler::Initialize();
-    ManagedNetworkConfigurationHandler::Initialize(&stub_profile_handler_);
+    network_profile_handler_.reset(new TestNetworkProfileHandler());
+    network_configuration_handler_.reset(
+        NetworkConfigurationHandler::InitializeForTest(
+            NULL /* no NetworkStateHandler */));
+    managed_network_configuration_handler_.reset(
+        new ManagedNetworkConfigurationHandler());
+    managed_network_configuration_handler_->Init(
+        NULL /* no NetworkStateHandler */,
+        network_profile_handler_.get(),
+        network_configuration_handler_.get());
+
     message_loop_.RunUntilIdle();
   }
 
   virtual void TearDown() OVERRIDE {
-    ManagedNetworkConfigurationHandler::Shutdown();
-    NetworkConfigurationHandler::Shutdown();
+    managed_network_configuration_handler_.reset();
+    network_configuration_handler_.reset();
+    network_profile_handler_.reset();
     DBusThreadManager::Shutdown();
   }
 
   void VerifyAndClearExpectations() {
     Mock::VerifyAndClearExpectations(&mock_manager_client_);
     Mock::VerifyAndClearExpectations(&mock_service_client_);
     Mock::VerifyAndClearExpectations(&mock_profile_client_);
+    SetNetworkConfigurationHandlerExpectations();
   }
 
   void InitializeStandardProfiles() {
     profiles_stub_.AddProfile(kUser1ProfilePath, kUser1);
-    stub_profile_handler_.AddProfile(NetworkProfile(kUser1ProfilePath, kUser1));
-    stub_profile_handler_.AddProfile(
-        NetworkProfile(kSharedProfilePath, std::string()));
+    network_profile_handler_->
+        AddProfileForTest(NetworkProfile(kUser1ProfilePath, kUser1));
+    network_profile_handler_->
+        AddProfileForTest(NetworkProfile(kSharedProfilePath, std::string()));
   }
 
   void SetUpEntry(const std::string& path_to_shill_json,
                   const std::string& profile_path,
                   const std::string& entry_path) {
     scoped_ptr<base::DictionaryValue> entry =
         test_utils::ReadTestDictionary(path_to_shill_json);
     profiles_stub_.AddEntry(profile_path, entry_path, *entry);
   }
 
   void SetPolicy(onc::ONCSource onc_source,
                  const std::string& userhash,
                  const std::string& path_to_onc) {
     scoped_ptr<base::DictionaryValue> policy;
     if (path_to_onc.empty())
       policy = onc::ReadDictionaryFromJson(onc::kEmptyUnencryptedConfiguration);
     else
       policy = test_utils::ReadTestDictionary(path_to_onc);
 
     base::ListValue* network_configs = NULL;
     policy->GetListWithoutPathExpansion(
         onc::toplevel_config::kNetworkConfigurations, &network_configs);
 
     managed_handler()->SetPolicy(
         onc::ONC_SOURCE_USER_POLICY, userhash, *network_configs);
   }
 
+  void SetNetworkConfigurationHandlerExpectations() {
+    // These calls occur in NetworkConfigurationHandler.
+    EXPECT_CALL(mock_manager_client_, GetProperties(_)).Times(AnyNumber());
+    EXPECT_CALL(mock_manager_client_,
+                AddPropertyChangedObserver(_)).Times(AnyNumber());
+    EXPECT_CALL(mock_manager_client_,
+                RemovePropertyChangedObserver(_)).Times(AnyNumber());
+  }
+
   ManagedNetworkConfigurationHandler* managed_handler() {
-    return ManagedNetworkConfigurationHandler::Get();
+    return managed_network_configuration_handler_.get();
   }
 
  protected:
   StrictMock<MockShillManagerClient> mock_manager_client_;
   StrictMock<MockShillServiceClient> mock_service_client_;
   StrictMock<MockShillProfileClient> mock_profile_client_;
-  NetworkProfileHandlerStub stub_profile_handler_;
   ShillProfileTestClient profiles_stub_;
+  scoped_ptr<TestNetworkProfileHandler> network_profile_handler_;
+  scoped_ptr<NetworkConfigurationHandler> network_configuration_handler_;
+  scoped_ptr<ManagedNetworkConfigurationHandler>
+        managed_network_configuration_handler_;
   MessageLoop message_loop_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ManagedNetworkConfigurationHandlerTest);
 };
 
 TEST_F(ManagedNetworkConfigurationHandlerTest, ProfileInitialization) {
   InitializeStandardProfiles();
   message_loop_.RunUntilIdle();
 }
@@ skipping 194 matching lines @@
               ConfigureServiceForProfile(
                   dbus::ObjectPath(kUser1ProfilePath),
                   IsEqualTo(expected_shill_properties.get()),
                   _, _));
 
   InitializeStandardProfiles();
   message_loop_.RunUntilIdle();
 }
 
 }  // namespace chromeos