diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 23:07:25 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 23:07:25 +0000 |
| commit | 4510541f84c5a019a9833a3ee1341246a954c994 (patch) | |
| tree | 60cd8a950432c33b8441fe15f129545546a997cc /chrome/browser/browser_main.cc | |
| parent | 705876878daf7081136ab82f20035d2d71dcc8f9 (diff) | |
| download | chromium_src-4510541f84c5a019a9833a3ee1341246a954c994.zip chromium_src-4510541f84c5a019a9833a3ee1341246a954c994.tar.gz chromium_src-4510541f84c5a019a9833a3ee1341246a954c994.tar.bz2 | |
Revert "Preload the visited link db on the file thread if the file exists."
There are ui_test crashes with this change.
This reverts commit r34874.
TBR=mirandac
Review URL: http://codereview.chromium.org/502063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index fd0f7fb..6ca2b4b 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -44,7 +44,6 @@ #include "chrome/browser/plugin_service.h" #include "chrome/browser/process_singleton.h" #include "chrome/browser/profile_manager.h" -#include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/user_data_manager.h" @@ -101,6 +100,7 @@ #include "chrome/browser/browser_trial.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" +#include "chrome/browser/profile.h" #include "chrome/browser/rlz/rlz.h" #include "chrome/browser/views/user_data_dir_dialog.h" #include "chrome/common/env_vars.h" @@ -682,10 +682,6 @@ int BrowserMain(const MainFunctionParams& parameters) { CHECK(profile) << "Cannot get default profile."; #endif - // Now that we have a profile, try to load the visited link master on a - // background thread. We want to start this as soon as we can. - profile->PreloadVisitedLinkMaster(); - PrefService* user_prefs = profile->GetPrefs(); DCHECK(user_prefs); |