Revert r96364, it's breaking a NaCl test.

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index d27d3337acdb66e864823e24663cafc5ab2d5094..3dec4f48adfd30a41daa04a6550d9f0d56c82bae 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