diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 18:34:53 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 18:34:53 +0000 |
| commit | dd86101d322f138a056d1d92f859b6b356c34a01 (patch) | |
| tree | 7fa678de3203c5c987a7b7a01e8acfa5e87a28cd /chrome/browser/browser_main.cc | |
| parent | eb4c6af05ac88f704db922be6e458e5d09a9d621 (diff) | |
| download | chromium_src-dd86101d322f138a056d1d92f859b6b356c34a01.zip chromium_src-dd86101d322f138a056d1d92f859b6b356c34a01.tar.gz chromium_src-dd86101d322f138a056d1d92f859b6b356c34a01.tar.bz2 | |
Revert r96364, it's breaking a NaCl test.
TEST=
BUG=
TBR=bauerb@chromium.org
Review URL: http://codereview.chromium.org/7627001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index d27d333..3dec4f4 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -57,7 +57,7 @@ #include "chrome/browser/net/chrome_net_log.h" #include "chrome/browser/net/predictor_api.h" #include "chrome/browser/net/sdch_dictionary_fetcher.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugin_updater.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_value_store.h" @@ -1906,6 +1906,9 @@ int BrowserMain(const MainFunctionParams& parameters) { browser_process->google_url_tracker(); browser_process->intranet_redirect_detector(); + // Do initialize the plug-in service (and related preferences). + PluginUpdater::GetInstance()->SetProfile(profile); + // Prepare for memory caching of SDCH dictionaries. // Perform A/B test to measure global impact of SDCH support. // Set up a field trial to see what disabling SDCH does to latency of page |