Revert 81394 (broke sync_integration_tests and clang) - This CL implements alternative asynchronous methods for profile and preferences loading.BUG=chromium-os:11104TEST=UserProfileGotten (see "/tmp/login-times-sent") time doesn't increase, while UI jankness decreases.Review URL: http://codereview.chromium.org/6716025

TBR=altimofeev@chromium.org
Review URL: http://codereview.chromium.org/6834021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81396 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 20 deletions

diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index b2473d99..a4bd592 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -15,7 +15,6 @@
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/i18n/icu_util.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ -103,22 +102,6 @@ bool SetFocusToAccessibleWindow(HWND hwnd) {
   return ret;
 }
 
-// Same as BrowserProcessImpl, but uses custom profile manager.
-class FakeBrowserProcessImpl : public BrowserProcessImpl {
- public:
-  explicit FakeBrowserProcessImpl(const CommandLine& command_line)
-      : BrowserProcessImpl(command_line) {}
-
-  virtual ProfileManager* profile_manager() {
-    if (!profile_manager_.get())
-      profile_manager_.reset(new ProfileManagerWithoutInit);
-    return profile_manager_.get();
-  }
-
- private:
-  scoped_ptr<ProfileManager> profile_manager_;
-};
-
 }  // namespace
 
 
@@ -230,7 +213,7 @@ void FakeExternalTab::Initialize() {
   cmd->AppendSwitch(switches::kDisableWebResources);
   cmd->AppendSwitch(switches::kSingleProcess);
 
-  browser_process_.reset(new FakeBrowserProcessImpl(*cmd));
+  browser_process_.reset(new BrowserProcessImpl(*cmd));
   // BrowserProcessImpl's constructor should set g_browser_process.
   DCHECK(g_browser_process);
   g_browser_process->SetApplicationLocale("en-US");
@@ -239,8 +222,8 @@ void FakeExternalTab::Initialize() {
   browser::RegisterLocalState(browser_process_->local_state());
 
   FilePath profile_path(ProfileManager::GetDefaultProfileDir(user_data()));
-  Profile* profile =
-      g_browser_process->profile_manager()->GetProfile(profile_path);
+  Profile* profile = g_browser_process->profile_manager()->GetProfile(
+      profile_path, false);
   // Create the child threads.
   g_browser_process->db_thread();
   g_browser_process->file_thread();