Revert 96409 - Speculatively revert r96364, it's the best bet on the NaCL breakage.

chrome/browser/profiles/profile_dependency_manager.cc

 // Copyright (c) 2011 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/profiles/profile_dependency_manager.h"
 
 #include <algorithm>
 #include <deque>
 #include <iterator>
 
 #include "chrome/browser/background/background_contents_service_factory.h"
+#include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "content/common/notification_service.h"
 
 class Profile;
 
 namespace {
 
 bool g_initialized = false;
 
 // This method gets the instance of each ServiceFactory. We do this so that
 // each ServiceFactory initializes iteslf and registers its dependencies with
 // the global PreferenceDependencyManager. We need to have a complete
 // dependency graph when we create a profile so we can dispatch the profile
 // creation message to the services that want to create their services at
 // profile creation time.
 //
 // TODO(erg): This needs to be something else. I don't think putting every
 // FooServiceFactory here will scale or is desireable long term.
 void AssertFactoriesBuilt() {
   if (!g_initialized) {
     BackgroundContentsServiceFactory::GetInstance();
     CloudPrintProxyServiceFactory::GetInstance();
+    PluginPrefs::Initialize();
     SessionServiceFactory::GetInstance();
     TabRestoreServiceFactory::GetInstance();
     TemplateURLServiceFactory::GetInstance();
 
     g_initialized = true;
   }
 }
 
 }  // namespace
 
@@ skipping 140 matching lines @@
     }
   }
 
   if (edges.size()) {
     NOTREACHED() << "Dependency graph has a cycle. We are doomed.";
   }
 
   std::reverse(output.begin(), output.end());
   destruction_order_ = output;
 }