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

chrome/browser/chromeos/login/wizard_controller.h

 // Copyright (c) 2010 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_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
+#include "chrome/browser/chromeos/login/string_fetcher.h"
 #include "chrome/browser/chromeos/login/view_screen.h"
 #include "chrome/browser/chromeos/login/wizard_screen.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class PrefService;
 class WizardContentsView;
 class WizardScreen;
 
 namespace chromeos {
 class AccountScreen;
@@ skipping 74 matching lines @@
   void set_observer(ScreenObserver* observer) { observer_ = observer; }
 
   // Sets partner startup customization. WizardController takes ownership
   // of the document object.
   void SetCustomization(
       const chromeos::StartupCustomizationDocument* customization);
 
   // Registers OOBE preferences.
   static void RegisterPrefs(PrefService* local_state);
 
+  // Applies partner services customizations.
+  void ApplyPartnerServicesCustomizations();
+
   static const char kNetworkScreenName[];
   static const char kLoginScreenName[];
   static const char kAccountScreenName[];
   static const char kUpdateScreenName[];
   static const char kUserImageScreenName[];
   static const char kRegistrationScreenName[];
   static const char kOutOfBoxScreenName[];
   static const char kTestNoScreenName[];
   static const char kEulaScreenName[];
 
@@ skipping 72 matching lines @@
 
   // NULL by default - controller itself is observer. Mock could be assigned.
   ScreenObserver* observer_;
 
   // Default WizardController.
   static WizardController* default_controller_;
 
   // Partner startup customizations.
   scoped_ptr<const chromeos::StartupCustomizationDocument> customization_;
 
+  // Partner services manifest fetcher.
+  scoped_ptr<StringFetcher> services_manifest_fetcher_;
+
   FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, ControlFlowErrorNetwork);
   FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, ControlFlowErrorUpdate);
   FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest,
                            ControlFlowLanguageOnLogin);
   FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest,
                            ControlFlowLanguageOnNetwork);
   FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, ControlFlowMain);
   FRIEND_TEST_ALL_PREFIXES(WizardControllerTest, SwitchLanguage);
   friend class WizardControllerFlowTest;
 
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_