Clean up ExtensionServiceTest.

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>
 
@@ skipping 19 matching lines @@
 
 // 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) {
+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();
     SpeechInputExtensionManager::InitializeFactory();
     PersonalDataManagerFactory::GetInstance();
     PluginPrefsFactory::GetInstance();
     prerender::PrerenderManagerFactory::GetInstance();
     SessionServiceFactory::GetInstance();
     TabRestoreServiceFactory::GetInstance();
     TemplateURLServiceFactory::GetInstance();
@@ skipping 38 matching lines @@
 
 void ProfileDependencyManager::CreateProfileServices(Profile* profile,
                                                      bool is_testing_profile) {
 #ifndef NDEBUG
   // Unmark |profile| as dead. This exists because of unit tests, which will
   // often have similar stack structures. 0xWhatever might be created, go out
   // of scope, and then a new Profile object might be created at 0xWhatever.
   dead_profile_pointers_.erase(profile);
 #endif
 
-  AssertFactoriesBuilt();
+  AssertFactoriesBuilt(is_testing_profile);
 
   if (destruction_order_.empty())
     BuildDestructionOrder();
 
   // Iterate in reverse destruction order for creation.
   for (std::vector<ProfileKeyedServiceFactory*>::reverse_iterator rit =
            destruction_order_.rbegin(); rit != destruction_order_.rend();
        ++rit) {
     if (!profile->IsOffTheRecord() && !profile->AsTestingProfile()) {
       // We only register preferences on normal profiles because the incognito
@@ skipping 95 matching lines @@
     }
   }
 
   if (edges.size()) {
     NOTREACHED() << "Dependency graph has a cycle. We are doomed.";
   }
 
   std::reverse(output.begin(), output.end());
   destruction_order_ = output;
 }