Clean up ExtensionServiceTest.

chrome/browser/profiles/profile_dependency_manager.cc

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 0f4cbacd530602e7d3eca3692d876db9ba0f867f..c80101928600a7047ade909ed242acadcc67edb7 100644
--- a/chrome/browser/profiles/profile_dependency_manager.cc
+++ b/chrome/browser/profiles/profile_dependency_manager.cc
@@ -37,8 +37,8 @@ bool g_initialized = false;
 //
 // 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) {
+void AssertFactoriesBuilt(bool is_testing_profile) {
+  if (!g_initialized || is_testing_profile) {

[Elliot Glaysher, 2011/11/21 18:47:06]

I don't understand this fix. Won't g_initialized always make sure these are
initialized anyway?

[Yoyo Zhou, 2011/11/21 23:14:52]

It looks like rsesek has been working on fixing this area recently, actually, so
I think I won't need this anymore.

     BackgroundContentsServiceFactory::GetInstance();
     CloudPrintProxyServiceFactory::GetInstance();
     CookieSettings::Factory::GetInstance();
@@ -97,7 +97,7 @@ void ProfileDependencyManager::CreateProfileServices(Profile* profile,
   dead_profile_pointers_.erase(profile);
 #endif
 
-  AssertFactoriesBuilt();
+  AssertFactoriesBuilt(is_testing_profile);
 
   if (destruction_order_.empty())
     BuildDestructionOrder();