Convert UserPolicySigninService to use OAuth2TokenService

components/browser_context_keyed_service/browser_context_dependency_manager.cc

 // Copyright (c) 2013 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 "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 
 #include <algorithm>
 #include <deque>
 #include <iterator>
 
@@ skipping 22 matching lines @@
   dependency_graph_.RemoveNode(component);
 }
 
 void BrowserContextDependencyManager::AddEdge(
     BrowserContextKeyedBaseFactory* depended,
     BrowserContextKeyedBaseFactory* dependee) {
   dependency_graph_.AddEdge(depended, dependee);
 }
 
 void BrowserContextDependencyManager::CreateBrowserContextServices(
-    content::BrowserContext* context, bool is_testing_context) {
+    content::BrowserContext* context) {
+  DoCreateBrowserContextServices(context, false, false);
+}
+
+void BrowserContextDependencyManager::CreateBrowserContextServicesForTest(
+    content::BrowserContext* context,
+    bool force_register_prefs) {
+  DoCreateBrowserContextServices(context, true, force_register_prefs);
+}
+
+void BrowserContextDependencyManager::DoCreateBrowserContextServices(
+    content::BrowserContext* context,
+    bool is_testing_context,
+    bool force_register_prefs) {
   TRACE_EVENT0("browser",
     "BrowserContextDependencyManager::CreateBrowserContextServices")

[Elliot Glaysher, 2013/08/16 18:07:59]

Update trace name too?

[Andrew T Wilson (Slow), 2013/08/19 12:15:56]

Done.

 #ifndef NDEBUG
   // Unmark |context| 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 BrowserContext object might be created
   // at 0xWhatever.
   dead_context_pointers_.erase(context);
 #endif
 
   std::vector<DependencyNode*> construction_order;
   if (!dependency_graph_.GetConstructionOrder(&construction_order)) {
     NOTREACHED();
   }
 
 #ifndef NDEBUG
   DumpBrowserContextDependencies(context);
 #endif
 
   for (size_t i = 0; i < construction_order.size(); i++) {
     BrowserContextKeyedBaseFactory* factory =
         static_cast<BrowserContextKeyedBaseFactory*>(construction_order[i]);
 
-    if (!context->IsOffTheRecord()) {
+    if (!context->IsOffTheRecord() || force_register_prefs) {
       // We only register preferences on normal contexts because the incognito
-      // context shares the pref service with the normal one.
+      // context shares the pref service with the normal one. Always register
+      // for standalone testing contexts (testing contexts that don't have an
+      // "original" profile set) as otherwise the preferences won't be
+      // registered.
       factory->RegisterUserPrefsOnBrowserContext(context);
     }
 
     if (is_testing_context && factory->ServiceIsNULLWhileTesting()) {
       factory->SetEmptyTestingFactory(context);
     } else if (factory->ServiceIsCreatedWithBrowserContext()) {
       // Create the service.
       factory->CreateServiceNow(context);
     }
   }
@@ skipping 70 matching lines @@
           kDumpBrowserContextDependencyGraphFlag)) {
     base::FilePath dot_file =
         context->GetPath().AppendASCII("browser-context-dependencies.dot");
     std::string contents = dependency_graph_.DumpAsGraphviz(
         "BrowserContext",
         base::Bind(&BrowserContextKeyedBaseFactoryGetNodeName));
     file_util::WriteFile(dot_file, contents.c_str(), contents.size());
   }
 }
 #endif  // NDEBUG