Fixed problems with initial locale change freezing Chrome OS on the device....

chrome/browser/browser_init.h

 // Copyright (c) 2006-2008 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 CHROME_BROWSER_BROWSER_INIT_H_
 #define CHROME_BROWSER_BROWSER_INIT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 58 matching lines @@
 
   // Launches a browser window associated with |profile|. |command_line|
   // should be the command line passed to this process. |cur_dir| can be
   // the null string, which implies that the directory of the executable.
   // should be used. |process_startup| indicates whether this is the
   // first browser.
   bool LaunchBrowser(const CommandLine& command_line, Profile* profile,
                      const std::wstring& cur_dir, bool process_startup,
                      int* return_code);
 
-#if defined(OS_CHROMEOS)
-  // Processes the OEM services customization document and modifies browser
-  // settings like initial startup page, web apps and extentions.
-  bool ApplyServicesCustomization(
-      const chromeos::ServicesCustomizationDocument* customization);
-#endif
-
   // LaunchWithProfile ---------------------------------------------------------
   //
   // Assists launching the application and appending the initial tabs for a
   // browser window.
 
   class LaunchWithProfile {
    public:
     // Used by OpenTabsInBrowser.
     struct Tab {
       Tab() : is_app(false), is_pinned(true) {}
@@ skipping 110 matching lines @@
                                  bool process_startup, Profile* profile,
                                  int* return_code, BrowserInit* browser_init);
 
   // Additional tabs to open during first run.
   std::vector<GURL> first_run_tabs_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserInit);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_INIT_H_