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 d456e2f8b3a551215d05996ed1316a2c750fc685..7aa684ffeb69dd071709524177e90b2ce6c56751 100644
--- a/chromeos/network/network_state_handler_unittest.cc
+++ b/chromeos/network/network_state_handler_unittest.cc
@@ -43,7 +43,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) {
@@ -52,8 +52,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 {
@@ -87,7 +87,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_;
@@ -113,7 +113,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_;
@@ -229,27 +229,30 @@ 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(
       NetworkTypePattern::Wimax(), false, network_handler::ErrorCallback());
   EXPECT_NE(
       NetworkStateHandler::TECHNOLOGY_ENABLED,
       network_state_handler_->GetTechnologyState(NetworkTypePattern::Wimax()));
-  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(
       NetworkTypePattern::Wimax(), 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(NetworkTypePattern::Wimax()));
   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(NetworkTypePattern::Wimax()));