Landing change for ers@chromium.org: http://codereview.chromium.org/4134012/s...

chrome/browser/chromeos/login/update_screen_browsertest.cc

 // Copyright (c) 2010 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 "chrome/browser/chromeos/cros/mock_login_library.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/cros/mock_update_library.h"
 #include "chrome/browser/chromeos/login/mock_screen_observer.h"
 #include "chrome/browser/chromeos/login/update_screen.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::Return;
 using ::testing::ReturnRef;
 
 class UpdateScreenTest : public WizardInProcessBrowserTest {
  public:
   UpdateScreenTest() : WizardInProcessBrowserTest("update"),
                        mock_login_library_(NULL),
                        mock_update_library_(NULL),
-                       mock_network_library_(NULL){}
+                       mock_network_library_(NULL) {}
 
  protected:
   virtual void SetUpInProcessBrowserTestFixture() {
     WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
     cros_mock_->InitStatusAreaMocks();
     cros_mock_->SetStatusAreaMocksExpectations();
     ASSERT_TRUE(CrosLibrary::Get()->EnsureLoaded());
 
     mock_login_library_ = new MockLoginLibrary();
     cros_mock_->test_api()->SetLoginLibrary(mock_login_library_, true);
@@ skipping 12 matching lines @@
         .Times(AtLeast(1));
     EXPECT_CALL(*mock_update_library_, CheckForUpdate())
         .Times(1)
         .WillOnce(Return(true));
 
     mock_network_library_ = cros_mock_->mock_network_library();
     EXPECT_CALL(*mock_network_library_, Connected())
         .Times(1)  // also called by NetworkMenu::InitMenuItems()
         .WillRepeatedly((Return(false)))
         .RetiresOnSaturation();
-    EXPECT_CALL(*mock_network_library_, AddObserver(_))
+    EXPECT_CALL(*mock_network_library_, AddNetworkManagerObserver(_))
         .Times(1)
         .RetiresOnSaturation();
   }
 
   virtual void TearDownInProcessBrowserTestFixture() {
     cros_mock_->test_api()->SetUpdateLibrary(NULL, true);
     WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
   }
 
   MockLoginLibrary* mock_login_library_;
@@ skipping 177 matching lines @@
       .WillRepeatedly(ReturnRef(status));
   EXPECT_CALL(*mock_screen_observer,
               OnExit(ScreenObserver::UPDATE_ERROR_UPDATING))
       .Times(1);
   update_screen->UpdateStatusChanged(mock_update_library_);
 
   controller()->set_observer(NULL);
 }
 
 }  // namespace chromeos