chromeos: Change all clients of LoginLibrary to use SessionManagerClient.

chrome/browser/chromeos/login/network_screen_browsertest.cc

Index: chrome/browser/chromeos/login/network_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/network_screen_browsertest.cc b/chrome/browser/chromeos/login/network_screen_browsertest.cc
index e645c912685d141aa16b6ecedc44c3e61b608d17..fbe2168a07bc0025792787f2dd1606f1b8497647 100644
--- a/chrome/browser/chromeos/login/network_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/network_screen_browsertest.cc
@@ -10,7 +10,8 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/mock_login_library.h"
+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/mock_screen_observer.h"
@@ -46,20 +47,22 @@ class DummyButtonListener : public views::ButtonListener {
 class NetworkScreenTest : public WizardInProcessBrowserTest {
  public:
   NetworkScreenTest(): WizardInProcessBrowserTest("network"),
-                       mock_login_library_(NULL),
+                       mock_session_manager_client_(NULL),
                        mock_network_library_(NULL) {
   }
 
  protected:
   virtual void SetUpInProcessBrowserTestFixture() {
+    DBusThreadManager::Initialize();
     cros_mock_->InitStatusAreaMocks();
     mock_network_library_ = cros_mock_->mock_network_library();
-    mock_login_library_ = new MockLoginLibrary();
+    mock_session_manager_client_ = new MockSessionManagerClient();
+    DBusThreadManager::Get()->set_session_manager_client_for_testing(
+        mock_session_manager_client_);
     cellular_.reset(new NetworkDevice("cellular"));
-    cros_mock_->test_api()->SetLoginLibrary(mock_login_library_, true);
-    EXPECT_CALL(*mock_login_library_, EmitLoginPromptReady())
+    EXPECT_CALL(*mock_session_manager_client_, EmitLoginPromptReady())
         .Times(1);
-    EXPECT_CALL(*mock_login_library_,RequestRetrievePolicy(_,_))
+    EXPECT_CALL(*mock_session_manager_client_, RetrievePolicy(_))
         .Times(AnyNumber());
 
     // Minimal set of expectations needed on NetworkScreen initialization.
@@ -131,7 +134,7 @@ class NetworkScreenTest : public WizardInProcessBrowserTest {
   virtual void TearDownInProcessBrowserTestFixture() {
     network_screen_->screen_observer_ = controller();
     CrosInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
-    cros_mock_->test_api()->SetLoginLibrary(NULL, false);
+    DBusThreadManager::Shutdown();
   }
 
   void EmulateContinueButtonExit(NetworkScreen* network_screen) {
@@ -145,7 +148,7 @@ class NetworkScreenTest : public WizardInProcessBrowserTest {
   }
 
   scoped_ptr<MockScreenObserver> mock_screen_observer_;
-  MockLoginLibrary* mock_login_library_;
+  MockSessionManagerClient* mock_session_manager_client_;
   MockNetworkLibrary* mock_network_library_;
   scoped_ptr<NetworkDevice> cellular_;
   NetworkScreen* network_screen_;