Reland "Remove chromeos::LibraryLoader"

chrome/browser/chromeos/cros/cros_mock.cc

Index: chrome/browser/chromeos/cros/cros_mock.cc
diff --git a/chrome/browser/chromeos/cros/cros_mock.cc b/chrome/browser/chromeos/cros/cros_mock.cc
index 51349741fdbcedb123efafa63bdaf8435cf7e33e..116f8f9a603803944aa16927f792ca0f50115e04 100644
--- a/chrome/browser/chromeos/cros/cros_mock.cc
+++ b/chrome/browser/chromeos/cros/cros_mock.cc
@@ -8,7 +8,6 @@
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
-#include "chrome/browser/chromeos/cros/mock_library_loader.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/login/wizard_screen.h"
@@ -29,8 +28,7 @@ using ::testing::StrictMock;
 using ::testing::_;
 
 CrosMock::CrosMock()
-    : loader_(NULL),
-      mock_cryptohome_library_(NULL),
+    : mock_cryptohome_library_(NULL),
       mock_network_library_(NULL) {
 }
 
@@ -45,18 +43,7 @@ void CrosMock::InitStatusAreaMocks() {
   InitMockNetworkLibrary();
 }
 
-void CrosMock::InitMockLibraryLoader() {
-  if (loader_)
-    return;
-  loader_ = new StrictMock<MockLibraryLoader>();
-  EXPECT_CALL(*loader_, Load(_))
-      .Times(AnyNumber())
-      .WillRepeatedly(Return(true));
-  test_api()->SetLibraryLoader(loader_, true);
-}
-
 void CrosMock::InitMockCryptohomeLibrary() {
-  InitMockLibraryLoader();
   if (mock_cryptohome_library_)
     return;
   mock_cryptohome_library_ = new StrictMock<MockCryptohomeLibrary>();
@@ -64,7 +51,6 @@ void CrosMock::InitMockCryptohomeLibrary() {
 }
 
 void CrosMock::InitMockNetworkLibrary() {
-  InitMockLibraryLoader();
   if (mock_network_library_)
     return;
   mock_network_library_ = new StrictMock<MockNetworkLibrary>();
@@ -212,8 +198,6 @@ void CrosMock::SetNetworkLibraryStatusAreaExpectations() {
 
 void CrosMock::TearDownMocks() {
   // Prevent bogus gMock leak check from firing.
-  if (loader_)
-    test_api()->SetLibraryLoader(NULL, false);
   if (mock_cryptohome_library_)
     test_api()->SetCryptohomeLibrary(NULL, false);
   if (mock_network_library_)