[cros] Temporary whitelist disk I/O on UIThread while store/retrieve signed setting.

chrome/browser/chromeos/login/signed_settings.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/signed_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "base/stringprintf.h"
+#include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
 
 namespace chromeos {
 
@@ skipping 212 matching lines @@
                                  const std::string& value,
                                  SignedSettings::Delegate<bool>* d)
     : name_(name),
       value_(value),
       d_(d) {
 }
 
 StorePropertyOp::~StorePropertyOp() {}
 
 void StorePropertyOp::Execute() {
-  if (!service_->IsAlreadyOwned()) {
+  bool is_owned = false;
+  {
+    // This should not do blocking IO from the UI thread.
+    // Temporarily allow it for now. http://crbug.com/70097
+    base::ThreadRestrictions::ScopedAllowIO allow_io;
+    is_owned = service_->IsAlreadyOwned();
+  }
+  if (!is_owned) {
     if (g_browser_process &&
         g_browser_process->local_state() &&
         SignedSettingsTempStorage::Store(name_, value_,
                                          g_browser_process->local_state())) {
       d_->OnSettingsOpCompleted(SUCCESS, true);
       return;
     }
   }
   // Posts a task to the FILE thread to sign |name_|=|value_|.
   std::string to_sign = base::StringPrintf("%s=%s",
@@ skipping 43 matching lines @@
 
 RetrievePropertyOp::~RetrievePropertyOp() {}
 
 void RetrievePropertyOp::Execute() {
   CHECK(chromeos::CrosLibrary::Get()->EnsureLoaded());
   // TODO(dilmah): Fix the race:
   // At the moment when device becomes owned there is lapse of time after
   // device has been owned and before temp_storage settings are finally
   // persisted into signed settings.
   // In this lapse of time Retrieve loses access to those settings.
-  if (!service_->IsAlreadyOwned()) {
+  bool is_owned = false;
+  {
+    // This should not do blocking IO from the UI thread.
+    // Temporarily allow it for now. http://crbug.com/70097
+    base::ThreadRestrictions::ScopedAllowIO allow_io;
+    is_owned = service_->IsAlreadyOwned();
+  }
+  if (!is_owned) {
     if (g_browser_process &&
         g_browser_process->local_state() &&
         SignedSettingsTempStorage::Retrieve(
             name_, &value_, g_browser_process->local_state())) {
       BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
           NewRunnableMethod(this,
                             &RetrievePropertyOp::OnKeyOpComplete,
                             OwnerManager::SUCCESS, std::vector<uint8>()));
       return;
@@ skipping 26 matching lines @@
   }
   // Now, sure we're on the UI thread.
   if (return_code == OwnerManager::SUCCESS)
     d_->OnSettingsOpCompleted(SUCCESS, value_);
   else
     d_->OnSettingsOpCompleted(SignedSettings::MapKeyOpCode(return_code),
                               std::string());
 }
 
 }  // namespace chromeos