Eliminate NetworkManagerChanged

chromeos/network/network_state_handler_unittest.cc

Index: chromeos/network/network_state_handler_unittest.cc
diff --git a/chromeos/network/network_state_handler_unittest.cc b/chromeos/network/network_state_handler_unittest.cc
index e32e4a57bd92766d41163a1eaff9008ef6a3f7eb..2ad4d88cb1eaf57b8625b35a860c1f98494e16ab 100644
--- a/chromeos/network/network_state_handler_unittest.cc
+++ b/chromeos/network/network_state_handler_unittest.cc
@@ -42,7 +42,7 @@ class TestObserver : public chromeos::NetworkStateHandlerObserver {
  public:
   explicit TestObserver(NetworkStateHandler* handler)
       : handler_(handler),
-        manager_changed_count_(0),
+        device_list_changed_count_(0),
         network_count_(0),
         default_network_change_count_(0),
         favorite_count_(0) {
@@ -51,8 +51,8 @@ class TestObserver : public chromeos::NetworkStateHandlerObserver {
   virtual ~TestObserver() {
   }
 
-  virtual void NetworkManagerChanged() OVERRIDE {
-    ++manager_changed_count_;
+  virtual void DeviceListChanged() OVERRIDE {
+    ++device_list_changed_count_;
   }
 
   virtual void NetworkListChanged() OVERRIDE {
@@ -86,7 +86,7 @@ class TestObserver : public chromeos::NetworkStateHandlerObserver {
     property_updates_[network->path()]++;
   }
 
-  size_t manager_changed_count() { return manager_changed_count_; }
+  size_t device_list_changed_count() { return device_list_changed_count_; }
   size_t network_count() { return network_count_; }
   size_t default_network_change_count() {
     return default_network_change_count_;
@@ -112,7 +112,7 @@ class TestObserver : public chromeos::NetworkStateHandlerObserver {
 
  private:
   NetworkStateHandler* handler_;
-  size_t manager_changed_count_;
+  size_t device_list_changed_count_;
   size_t network_count_;
   size_t default_network_change_count_;
   std::string default_network_;
@@ -221,25 +221,28 @@ TEST_F(NetworkStateHandlerTest, NetworkStateHandlerStub) {
 
 TEST_F(NetworkStateHandlerTest, TechnologyChanged) {
   // There may be several manager changes during initialization.
-  size_t initial_changed_count = test_observer_->manager_changed_count();
+  size_t initial_changed_count = test_observer_->device_list_changed_count();
   // Disable a technology.
   network_state_handler_->SetTechnologyEnabled(
       flimflam::kTypeWimax, false, network_handler::ErrorCallback());
   EXPECT_NE(NetworkStateHandler::TECHNOLOGY_ENABLED,
             network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
-  EXPECT_EQ(initial_changed_count + 1, test_observer_->manager_changed_count());
+  EXPECT_EQ(initial_changed_count + 1,
+            test_observer_->device_list_changed_count());
   // Enable a technology.
   network_state_handler_->SetTechnologyEnabled(
       flimflam::kTypeWimax, true, network_handler::ErrorCallback());
   // The technology state should immediately change to ENABLING and we should
   // receive a manager changed callback.
-  EXPECT_EQ(initial_changed_count + 2, test_observer_->manager_changed_count());
+  EXPECT_EQ(initial_changed_count + 2,
+            test_observer_->device_list_changed_count());
   EXPECT_EQ(NetworkStateHandler::TECHNOLOGY_ENABLING,
             network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
   message_loop_.RunUntilIdle();
   // Ensure we receive 2 manager changed callbacks when the technology becomes
   // avalable and enabled.
-  EXPECT_EQ(initial_changed_count + 4, test_observer_->manager_changed_count());
+  EXPECT_EQ(initial_changed_count + 4,
+            test_observer_->device_list_changed_count());
   EXPECT_EQ(NetworkStateHandler::TECHNOLOGY_ENABLED,
             network_state_handler_->GetTechnologyState(flimflam::kTypeWimax));
 }