Show hardware addresses for wifi and ethernet networks.

chrome/browser/chromeos/login/update_screen_browsertest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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::AnyNumber;
 using ::testing::AtLeast;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::Invoke;
 
 static void RequestUpdateCheckSuccess(UpdateCallback callback, void* userdata) {
   callback(userdata, chromeos::UPDATE_RESULT_SUCCESS, NULL);
 }
 
 class UpdateScreenTest : public WizardInProcessBrowserTest {
@@ skipping 30 matching lines @@
         .WillOnce(Invoke(RequestUpdateCheckSuccess));
 
     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_, AddNetworkManagerObserver(_))
         .Times(1)
         .RetiresOnSaturation();
+    EXPECT_CALL(*mock_network_library_, FindWifiDevice()).Times(AnyNumber());

[stevenjb, 2011/04/26 17:05:08]

nit: we generally put each .Times, etc on a new line regardless of whether or
not it fits (easier to read).

[Denis Lagno, 2011/04/26 18:04:09]

Done.

+    EXPECT_CALL(*mock_network_library_, FindEthernetDevice())
+        .Times(AnyNumber());
   }
 
   virtual void TearDownInProcessBrowserTestFixture() {
     cros_mock_->test_api()->SetUpdateLibrary(NULL, true);
     WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
   }
 
   MockLoginLibrary* mock_login_library_;
   MockUpdateLibrary* mock_update_library_;
   MockNetworkLibrary* mock_network_library_;
@@ skipping 173 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