Revert of Move content/browser/power_save_blocker to //device/power_save_blocker

components/drive/drive_uploader.cc

 // Copyright (c) 2012 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 "components/drive/drive_uploader.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
 #include "components/drive/service/drive_service_interface.h"
-#include "content/public/browser/browser_thread.h"
-#include "device/power_save_blocker/power_save_blocker.h"
+#include "content/public/browser/power_save_blocker_factory.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 using google_apis::CancelCallback;
 using google_apis::FileResource;
 using google_apis::DRIVE_CANCELLED;
 using google_apis::DriveApiErrorCode;
 using google_apis::DRIVE_NO_SPACE;
 using google_apis::HTTP_CONFLICT;
 using google_apis::HTTP_CREATED;
 using google_apis::HTTP_FORBIDDEN;
@@ skipping 62 matching lines @@
   UploadFileInfo(const base::FilePath& local_path,
                  const std::string& content_type,
                  const UploadCompletionCallback& callback,
                  const ProgressCallback& progress_callback)
       : file_path(local_path),
         content_type(content_type),
         completion_callback(callback),
         progress_callback(progress_callback),
         content_length(0),
         next_start_position(-1),
-        power_save_blocker(device::PowerSaveBlocker::CreateWithTaskRunners(
-            device::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension,
-            device::PowerSaveBlocker::kReasonOther,
-            "Upload in progress",
-            content::BrowserThread::GetMessageLoopProxyForThread(
-                content::BrowserThread::UI),
-            content::BrowserThread::GetMessageLoopProxyForThread(
-                content::BrowserThread::FILE))),
+        power_save_blocker(content::CreatePowerSaveBlocker(
+            content::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension,
+            content::PowerSaveBlocker::kReasonOther,
+            "Upload in progress")),
         cancelled(false),
         weak_ptr_factory_(this) {}
 
   ~UploadFileInfo() {
   }
 
   // Useful for printf debugging.
   std::string DebugString() const {
     return "file_path=[" + file_path.AsUTF8Unsafe() +
            "], content_type=[" + content_type +
@@ skipping 21 matching lines @@
   // Location URL where file is to be uploaded to, returned from
   // InitiateUpload. Used for the subsequent ResumeUpload requests.
   GURL upload_location;
 
   // Header content-Length.
   int64_t content_length;
 
   int64_t next_start_position;
 
   // Blocks system suspend while upload is in progress.
-  std::unique_ptr<device::PowerSaveBlocker> power_save_blocker;
+  std::unique_ptr<content::PowerSaveBlocker> power_save_blocker;
 
   // Fields for implementing cancellation. |cancel_callback| is non-null if
   // there is an in-flight HTTP request. In that case, |cancell_callback| will
   // cancel the operation. |cancelled| is initially false and turns to true
   // once Cancel() is called. DriveUploader will check this field before after
   // an async task other than HTTP requests and cancels the subsequent requests
   // if this is flagged to true.
   CancelCallback cancel_callback;
   bool cancelled;
 
@@ skipping 371 matching lines @@
     DVLOG(1) << "Upload failed " << upload_file_info->DebugString();
     if (error == HTTP_PRECONDITION)
       error = HTTP_CONFLICT;  // ETag mismatch.
     upload_file_info->completion_callback.Run(error,
                                               upload_file_info->upload_location,
                                               std::unique_ptr<FileResource>());
   }
 }
 
 }  // namespace drive