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

chrome/browser/browser_process_impl.cc

 // 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.
 
 #include "chrome/browser/browser_process_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 620 matching lines @@
     media_file_system_registry_.reset(new chrome::MediaFileSystemRegistry());
   return media_file_system_registry_.get();
 }
 
 #if !defined(OS_WIN)
 void BrowserProcessImpl::PlatformSpecificCommandLineProcessing(
     const CommandLine& command_line) {
 }
 #endif
 
+bool BrowserProcessImpl::created_local_state() const {
+    return created_local_state_;
+}
+
 // static
 void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
                                 false);
   // This policy needs to be defined before the net subsystem is initialized,
   // so we do it here.
   registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy,
                                 net::kDefaultMaxSocketsPerProxyServer);
 
   // This is observed by ChildProcessSecurityPolicy, which lives in content/
@@ skipping 397 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)