Eliminate potential for flaky crash in BCKSFactory::SetTestingFactory().

components/browser_context_keyed_service/browser_context_keyed_base_factory.h

 // Copyright (c) 2012 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.
 
 #ifndef COMPONENTS_BROWSER_CONTEXT_KEYED_SERVICE_BROWSER_CONTEXT_KEYED_BASE_FACTORY_H_
 #define COMPONENTS_BROWSER_CONTEXT_KEYED_SERVICE_BROWSER_CONTEXT_KEYED_BASE_FACTORY_H_
 
 #include <set>
 
 #include "base/threading/non_thread_safe.h"
@@ skipping 93 matching lines @@
   //   you do.
   virtual void BrowserContextShutdown(content::BrowserContext* context) = 0;
   virtual void BrowserContextDestroyed(content::BrowserContext* context);
 
   // Returns whether we've registered the preferences on this context.
   bool ArePreferencesSetOn(content::BrowserContext* context) const;
 
   // Mark context as Preferences set.
   void MarkPreferencesSetOn(content::BrowserContext* context);
 
+  // Which BrowserContextDependencyManager we should communicate with.
+  // In real code, this will always be
+  // BrowserContextDependencyManager::GetInstance(), but unit tests will want
+  // to use their own copy.
+  BrowserContextDependencyManager* dependency_manager_;
+
  private:
   friend class BrowserContextDependencyManager;
   friend class BrowserContextDependencyManagerUnittests;
 
   // Registers any user preferences on this service. This is called by
   // RegisterProfilePrefsIfNecessary() and should be overriden by any service
   // that wants to register profile-specific preferences.
   virtual void RegisterProfilePrefs(
       user_prefs::PrefRegistrySyncable* registry) {}
 
   // These two methods are for tight integration with the
   // BrowserContextDependencyManager.
 
   // Because of ServiceIsNULLWhileTesting(), we need a way to tell different
   // subclasses that they should disable testing.
   virtual void SetEmptyTestingFactory(content::BrowserContext* context) = 0;
 
   // We also need a generalized, non-returning method that generates the object
   // now for when we're creating the context.
   virtual void CreateServiceNow(content::BrowserContext* context) = 0;
 
-  // Which BrowserContextDependencyManager we should communicate with.
-  // In real code, this will always be
-  // BrowserContextDependencyManager::GetInstance(), but unit tests will want
-  // to use their own copy.
-  BrowserContextDependencyManager* dependency_manager_;
-
   // BrowserContexts that have this service's preferences registered on them.
   std::set<const content::BrowserContext*> registered_preferences_;
 
 #if !defined(NDEBUG)
   // A static string passed in to our constructor. Should be unique across all
   // services. This is used only for debugging in debug mode. (We can print
   // pretty graphs with GraphViz with this information.)
   const char* service_name_;
 #endif
 };
 
 #endif  // COMPONENTS_BROWSER_CONTEXT_KEYED_SERVICE_BROWSER_CONTEXT_KEYED_BASE_FACTORY_H_