Merge 190833 "Show user data dialog earlier on Windows."

chrome/browser/browser_process_impl.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.
 
 // When each service is created, we set a flag indicating this. At this point,
 // the service initialization could fail or succeed. This allows us to remember
 // if we tried to create a service, and not try creating it over and over if
 // the creation failed.
 
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
@@ skipping 119 matching lines @@
 
   virtual ChromeNetLog* net_log() OVERRIDE;
   virtual prerender::PrerenderTracker* prerender_tracker() OVERRIDE;
   virtual ComponentUpdateService* component_updater() OVERRIDE;
   virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
   virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
   virtual chrome::MediaFileSystemRegistry*
       media_file_system_registry() OVERRIDE;
   virtual void PlatformSpecificCommandLineProcessing(
       const CommandLine& command_line) OVERRIDE;
+  virtual bool created_local_state() const OVERRIDE;
 
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
  private:
   void CreateMetricsService();
   void CreateWatchdogThread();
 #if defined(OS_CHROMEOS)
   void InitializeWebSocketProxyThread();
 #endif
   void CreateProfileManager();
@@ skipping 159 matching lines @@
 #endif
 
   // TODO(eroman): Remove this when done debugging 113031. This tracks
   // the callstack which released the final module reference count.
   base::debug::StackTrace release_last_reference_callstack_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_