Temporary whitelist several cases of disk I/O on the UI threads in cros.

chrome/browser/chromeos/login/wizard_controller.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 
 #include <gdk/gdk.h>
 #include <signal.h>
 #include <sys/types.h>
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/input_method_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/cros/system_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/account_screen.h"
@@ skipping 158 matching lines @@
   // Launch browser after controller is deleted and its windows are closed.
   chromeos::LoginUtils::Get()->EnableBrowserLaunch(true);
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       NewRunnableFunction(&chromeos::LoginUtils::DoBrowserLaunch,
                           ProfileManager::GetDefaultProfile()));
 }
 
 const chromeos::StartupCustomizationDocument* LoadStartupManifest() {
-  // Load partner customization startup manifest if it is available.
+  // Loading manifest causes us to do blocking IO on UI thread.
+  // Temporarily allow it until we fix http://crosbug.com/11103
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
   FilePath startup_manifest_path(kStartupCustomizationManifestPath);
   if (file_util::PathExists(startup_manifest_path)) {
     scoped_ptr<chromeos::StartupCustomizationDocument> customization(
         new chromeos::StartupCustomizationDocument());
     bool manifest_loaded = customization->LoadManifestFromFile(
         startup_manifest_path);
     if (manifest_loaded) {
       VLOG(1) << "Startup manifest loaded successfully";
       return customization.release();
     }
@@ skipping 615 matching lines @@
   SaveBoolPreferenceForced(kEulaAccepted, true);
 }
 
 // static
 void WizardController::MarkOobeCompleted() {
   SaveBoolPreferenceForced(kOobeComplete, true);
 }
 
 // static
 bool WizardController::IsDeviceRegistered() {
+  // Checking for flag file causes us to do blocking IO on UI thread.
+  // Temporarily allow it until we fix http://crbug.com/70131
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
   FilePath oobe_complete_flag_file_path(kOobeCompleteFlagFilePath);
   return file_util::PathExists(oobe_complete_flag_file_path);
 }
 
 // static
 bool WizardController::IsRegisterScreenDefined() {
   const chromeos::StartupCustomizationDocument* manifest = NULL;
   // This method will be called from ExistingUserController too
   // when Wizard instance doesn't exist.
   if (default_controller())
     manifest = default_controller()->GetCustomization();
   else
     manifest = LoadStartupManifest();
   return IsRegistrationScreenValid(manifest);
 }
 
 // static
 void WizardController::MarkDeviceRegistered() {
+  // Creating flag file causes us to do blocking IO on UI thread.
+  // Temporarily allow it until we fix http://crbug.com/70131
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
   // Create flag file for boot-time init scripts.
   FilePath oobe_complete_path(kOobeCompleteFlagFilePath);
   FILE* oobe_flag_file = file_util::OpenFile(oobe_complete_path, "w+b");
   DCHECK(oobe_flag_file != NULL) << kOobeCompleteFlagFilePath;
   if (oobe_flag_file != NULL)
     file_util::CloseFile(oobe_flag_file);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, chromeos::ScreenObserver overrides:
@@ skipping 143 matching lines @@
     // chromeos::LanguageSwitchMenu::SwitchLanguage here before
     // EmitLoginPromptReady.
     const std::string current_locale =
         g_browser_process->local_state()->GetString(
             prefs::kApplicationLocale);
     VLOG(1) << "Current locale: " << current_locale;
     if (current_locale.empty()) {
       locale = controller->GetCustomization()->initial_locale();
       VLOG(1) << "Initial locale: " << locale;
       if (!locale.empty()) {
-        const std::string loaded_locale =
-            ResourceBundle::ReloadSharedInstance(locale);
-        CHECK(!loaded_locale.empty()) << "Locale could not be found for "
-                                      << locale;
+        {

[Dmitry Polukhin, 2011/01/24 11:32:02]

You are already in scope "if () {". There is no need for one more.

[Nikita (slow), 2011/01/24 12:55:33]

Done.

+          // Reloading resource bundle causes us to do blocking IO on UI thread.
+          // Temporarily allow it until we fix http://crosbug.com/11102
+          base::ThreadRestrictions::ScopedAllowIO allow_io;
+          const std::string loaded_locale =
+              ResourceBundle::ReloadSharedInstance(locale);
+          CHECK(!loaded_locale.empty()) << "Locale could not be found for "
+                                        << locale;
+        }
       }
     }
   }
 
   controller->ShowBackground(screen_bounds);
   controller->Init(first_screen_name, screen_bounds);
   controller->Show();
 
   chromeos::LoginUtils::Get()->PrewarmAuthentication();
   if (chromeos::CrosLibrary::Get()->EnsureLoaded())
@@ skipping 11 matching lines @@
     // user has changed to during OOBE.
     if (!timezone_name.empty()) {
       icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
           icu::UnicodeString::fromUTF8(timezone_name));
       chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone);
     }
   }
 }
 
 }  // namespace browser