chromeos: Fix UpdateScreenTest and NetworkScreenTest for Debug build.

chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

 // 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 "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/cros/cros_mock.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_display.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/login_performer.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/mock_authenticator.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "grit/generated_resources.h"
@@ skipping 75 matching lines @@
  private:
   ExistingUserController* controller_;
 
   DISALLOW_COPY_AND_ASSIGN(MockLoginPerformerDelegate);
 };
 
 class ExistingUserControllerTest : public CrosInProcessBrowserTest {
  protected:
   ExistingUserControllerTest()
       : mock_cryptohome_library_(NULL),
-        mock_session_manager_client_(NULL),
         mock_network_library_(NULL),
         mock_login_display_(NULL),
         mock_login_display_host_(NULL) {
   }
 
   ExistingUserController* existing_user_controller() {
     return ExistingUserController::current_controller();
   }
 
   virtual void SetUpInProcessBrowserTestFixture() {
-    DBusThreadManager::Initialize();
+    MockDBusThreadManager* mock_dbus_thread_manager =
+        new MockDBusThreadManager;
+    DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);

[oshima, 2011/10/29 00:07:02]

See my comment on http://codereview.chromium.org/8343069/
Up to you though.

[satorux1, 2011/10/29 04:57:35]

Thanks, but I decided to keep it as-is.

     CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
     cros_mock_->InitStatusAreaMocks();
     cros_mock_->SetStatusAreaMocksExpectations();
 
     mock_network_library_ = cros_mock_->mock_network_library();
-    mock_session_manager_client_ = new MockSessionManagerClient();
-    DBusThreadManager::Get()->set_session_manager_client_for_testing(
-        mock_session_manager_client_);
-    EXPECT_CALL(*mock_session_manager_client_, EmitLoginPromptReady())
+    MockSessionManagerClient* mock_session_manager_client
+        = mock_dbus_thread_manager->mock_session_manager_client();

[oshima, 2011/10/29 00:07:02]

move = above

[satorux1, 2011/10/29 04:57:35]

Done.

+    EXPECT_CALL(*mock_session_manager_client, EmitLoginPromptReady())
         .Times(1);
-    EXPECT_CALL(*mock_session_manager_client_, RetrievePolicy(_))
+    EXPECT_CALL(*mock_session_manager_client, RetrievePolicy(_))
         .Times(AnyNumber());
 
     cros_mock_->InitMockCryptohomeLibrary();
     mock_cryptohome_library_ = cros_mock_->mock_cryptohome_library();
     EXPECT_CALL(*mock_cryptohome_library_, IsMounted())
         .Times(AnyNumber())
         .WillRepeatedly(Return(true));
     LoginUtils::Set(new MockLoginUtils(kUsername, kPassword));
 
     mock_login_display_.reset(new MockLoginDisplay());
@@ skipping 18 matching lines @@
     existing_user_controller()->set_login_performer_delegate(mock_delegate);
   }
 
   virtual void TearDownInProcessBrowserTestFixture() {
     CrosInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
     DBusThreadManager::Shutdown();
   }
 
   // These mocks are owned by CrosLibrary class.
   MockCryptohomeLibrary* mock_cryptohome_library_;
-  MockSessionManagerClient* mock_session_manager_client_;
   MockNetworkLibrary* mock_network_library_;
 
   scoped_ptr<MockLoginDisplay> mock_login_display_;
   scoped_ptr<MockLoginDisplayHost> mock_login_display_host_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ExistingUserControllerTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, NewUserLogin) {
   EXPECT_CALL(*mock_login_display_host_, SetStatusAreaEnabled(false))
       .Times(1);
   EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))
       .Times(1);
   EXPECT_CALL(*mock_login_display_host_,
               StartWizard(WizardController::kUserImageScreenName,
                           GURL()))
       .Times(1);
   existing_user_controller()->Login(kUsername, kPassword);
 }
 
 }  // namespace chromeos