Merge PowerSaveBlockerImpl and PowerSaveBlocker

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"
@@ skipping 81 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(
+        power_save_blocker(new device::PowerSaveBlocker(
             device::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension,
             device::PowerSaveBlocker::kReasonOther,
             "Upload in progress",
             content::BrowserThread::GetMessageLoopProxyForThread(
                 content::BrowserThread::UI),
             content::BrowserThread::GetMessageLoopProxyForThread(
                 content::BrowserThread::FILE))),
         cancelled(false),
         weak_ptr_factory_(this) {}
 
@@ skipping 420 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