chrome/browser/profiles/profile_dependency_manager.cc - Issue 7627001: Revert r96364, it's breaking a NaCl test.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/profile_dependency_manager.cc

Issue 7627001: Revert r96364, it's breaking a NaCl test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: make it prettier Created 9 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/profiles/profile_dependency_manager.cc

diff --git a/chrome/browser/profiles/profile_dependency_manager.cc b/chrome/browser/profiles/profile_dependency_manager.cc

index db551a2dd36e50f92b73158536132c116ddec066..cdfbe2f4d4633909c274d66f212ed92fcd1c46ea 100644

--- a/chrome/browser/profiles/profile_dependency_manager.cc

+++ b/chrome/browser/profiles/profile_dependency_manager.cc

@@ -9,7 +9,6 @@

#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"

@@ -37,7 +36,6 @@ void AssertFactoriesBuilt() {

if (!g_initialized) {

BackgroundContentsServiceFactory::GetInstance();

CloudPrintProxyServiceFactory::GetInstance();

- PluginPrefs::Initialize();

SessionServiceFactory::GetInstance();

TabRestoreServiceFactory::GetInstance();

TemplateURLServiceFactory::GetInstance();

« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/webui/plugins_ui.cc » ('j') | no next file with comments »