Revert 63600 - Thread IO safety: annotate file_util, and block IO thread from...

chrome/browser/service/service_process_control.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/service/service_process_control.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/process_util.h"
 #include "base/stl_util-inl.h"
 #include "base/thread.h"
-#include "base/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/child_process_host.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/service_messages.h"
 #include "chrome/common/service_process_util.h"
 
@@ skipping 26 matching lines @@
   void DoRun(Task* task) {
     base::LaunchApp(*cmd_line_.get(), false, true, NULL);
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         NewRunnableMethod(this, &Launcher::DoDetectLaunched, task));
   }
 
   void DoDetectLaunched(Task* task) {
     const uint32 kMaxLaunchDetectRetries = 10;
 
-    {
-      // We should not be doing blocking disk IO from this thread!
-      // Temporarily allowed until we fix
-      //   http://code.google.com/p/chromium/issues/detail?id=60207
-      base::ThreadRestrictions::ScopedAllowIO allow_io;
-      launched_ = CheckServiceProcessReady();
-    }
-
+    launched_ = CheckServiceProcessReady();
     if (launched_ || (retry_count_ >= kMaxLaunchDetectRetries)) {
       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
           NewRunnableMethod(this, &Launcher::Notify, task));
       return;
     }
     retry_count_++;
     // If the service process is not launched yet then check again in 2 seconds.
     const int kDetectLaunchRetry = 2000;
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
@@ skipping 228 matching lines @@
 }
 
 bool ServiceProcessControl::GetCloudPrintProxyStatus(
     Callback2<bool, std::string>::Type* cloud_print_status_callback) {
   DCHECK(cloud_print_status_callback);
   cloud_print_status_callback_.reset(cloud_print_status_callback);
   return Send(new ServiceMsg_IsCloudPrintProxyEnabled);
 }
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcessControl);