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

chrome/browser/printing/print_dialog_cloud_uitest.cc

Index: chrome/browser/printing/print_dialog_cloud_uitest.cc
===================================================================
--- chrome/browser/printing/print_dialog_cloud_uitest.cc	(revision 63629)
+++ chrome/browser/printing/print_dialog_cloud_uitest.cc	(working copy)
@@ -11,7 +11,6 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
-#include "base/thread_restrictions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_thread.h"
@@ -33,11 +32,7 @@
  public:
   TestData() {}
 
-  const char* GetTestData() {
-    // Fetching this data blocks the IO thread, but we don't really care because
-    // this is a test.
-    base::ThreadRestrictions::ScopedAllowIO allow_io;
-
+  char* GetTestData() {
     if (test_data_.empty()) {
       FilePath test_data_directory;
       PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory);
@@ -45,7 +40,7 @@
           test_data_directory.AppendASCII("printing/cloud_print_uitest.html");
       file_util::ReadFileToString(test_file, &test_data_);
     }
-    return test_data_.c_str();
+    return &test_data_[0];
   }
  private:
   std::string test_data_;