Green Tree Tactical Force: Revert skrul's bad commits (probably a git-cl bug).

chrome/browser/browser_main.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/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 126 matching lines @@
 #include "base/nss_util.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/views/chrome_views_delegate.h"
 #include "views/focus/accelerator_handler.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/fake/fake_cryptohome_library.h"
-#include "chrome/browser/chromeos/cros/fake/fake_input_method_library.h"
-#include "chrome/browser/chromeos/cros/fake/fake_keyboard_library.h"
-#include "chrome/browser/chromeos/cros/fake/fake_library_loader.h"
-#include "chrome/browser/chromeos/cros/fake/fake_login_library.h"
-#include "chrome/browser/chromeos/cros/fake/fake_mount_library.h"
-#include "chrome/browser/chromeos/cros/fake/fake_network_library.h"
-#include "chrome/browser/chromeos/cros/fake/fake_screen_lock_library.h"
-#include "chrome/browser/chromeos/cros/fake/fake_synaptics_library.h"
-#include "chrome/browser/chromeos/cros/fake/fake_system_library.h"
-#include "chrome/browser/chromeos/cros/fake/fake_power_library.h"
-#include "chrome/browser/chromeos/cros/fake/fake_update_library.h"
 #include "chrome/browser/chromeos/cros/screen_lock_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/views/browser_dialogs.h"
 #endif
 
 // BrowserMainParts ------------------------------------------------------------
 
@@ skipping 815 matching lines @@
                       "now to avoid profile corruption.";
         return ResultCodes::PROFILE_IN_USE;
 
       default:
         NOTREACHED();
     }
 #if !defined(OS_MACOSX)  // closing brace for if
   }
 #endif
 
-#if defined(OS_CHROMEOS)
-  // Install a "fake" version of libcros if specified.
-  if (parsed_command_line.HasSwitch(switches::kUseFakeLibcros)) {
-    chromeos::CrosLibrary::TestApi* test_api =
-        chromeos::CrosLibrary::Get()->GetTestApi();
-    test_api->SetLibraryLoader(new chromeos::FakeLibraryLoader, true);
-    test_api->SetSynapticsLibrary(new chromeos::FakeSynapticsLibrary, true);
-    test_api->SetInputMethodLibrary(new chromeos::FakeInputMethodLibrary, true);
-    test_api->SetKeyboardLibrary(new chromeos::FakeKeyboardLibrary, true);
-    test_api->SetNetworkLibrary(new chromeos::FakeNetworkLibrary, true);
-    test_api->SetPowerLibrary(new chromeos::FakePowerLibrary, true);
-    test_api->SetSystemLibrary(new chromeos::FakeSystemLibrary, true);
-    test_api->SetLoginLibrary(new chromeos::FakeLoginLibrary, true);
-    test_api->SetCryptohomeLibrary(new chromeos::FakeCryptohomeLibrary, true);
-    test_api->SetScreenLockLibrary(new chromeos::FakeScreenLockLibrary, true);
-    test_api->SetMountLibrary(new chromeos::FakeMountLibrary, true);
-    test_api->SetUpdateLibrary(new chromeos::FakeUpdateLibrary, true);
-}
-#endif
-
   // Profile creation ----------------------------------------------------------
 
 #if defined(OS_CHROMEOS)
   // Initialize the screen locker now so that it can receive
   // LOGIN_USER_CHANGED notification from UserManager.
   chromeos::ScreenLocker::InitClass();
 
   // This forces the ProfileManager to be created and register for the
   // notification it needs to track the logged in user.
   g_browser_process->profile_manager()->GetDefaultProfile();
@@ skipping 312 matching lines @@
 
   metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   ignore_result(browser_process.release());
   browser_shutdown::Shutdown();
 
   return result_code;
 }