summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-08-29 06:34:04 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-29 13:35:30 +0000
commit65600b44835e96dee0dcd563d4a3644427c50615 (patch)
treec4bea025c36ecd9fe1ea7e104d4842559d0bcbef
parent5ea692e8b2019af721b9ddf33ef1c945239c8fdc (diff)
downloadchromium_src-65600b44835e96dee0dcd563d4a3644427c50615.zip
chromium_src-65600b44835e96dee0dcd563d4a3644427c50615.tar.gz
chromium_src-65600b44835e96dee0dcd563d4a3644427c50615.tar.bz2
Manual fixups in drive code for scoped_refptr operator T* removal.
BUG=110610 Review URL: https://codereview.chromium.org/511323002 Cr-Commit-Position: refs/heads/master@{#292620}
-rw-r--r--chrome/browser/drive/drive_uploader.cc5
-rw-r--r--chrome/browser/drive/drive_uploader.h2
-rw-r--r--google_apis/drive/request_sender.cc2
-rw-r--r--google_apis/drive/request_sender.h9
-rw-r--r--google_apis/drive/request_sender_unittest.cc1
5 files changed, 11 insertions, 8 deletions
diff --git a/chrome/browser/drive/drive_uploader.cc b/chrome/browser/drive/drive_uploader.cc
index 2bae303..09c5137 100644
--- a/chrome/browser/drive/drive_uploader.cc
+++ b/chrome/browser/drive/drive_uploader.cc
@@ -124,8 +124,9 @@ struct DriveUploader::UploadFileInfo {
DISALLOW_COPY_AND_ASSIGN(UploadFileInfo);
};
-DriveUploader::DriveUploader(DriveServiceInterface* drive_service,
- base::TaskRunner* blocking_task_runner)
+DriveUploader::DriveUploader(
+ DriveServiceInterface* drive_service,
+ const scoped_refptr<base::TaskRunner>& blocking_task_runner)
: drive_service_(drive_service),
blocking_task_runner_(blocking_task_runner),
weak_ptr_factory_(this) {
diff --git a/chrome/browser/drive/drive_uploader.h b/chrome/browser/drive/drive_uploader.h
index cbb74b9..c458371 100644
--- a/chrome/browser/drive/drive_uploader.h
+++ b/chrome/browser/drive/drive_uploader.h
@@ -114,7 +114,7 @@ class DriveUploaderInterface {
class DriveUploader : public DriveUploaderInterface {
public:
DriveUploader(DriveServiceInterface* drive_service,
- base::TaskRunner* blocking_task_runner);
+ const scoped_refptr<base::TaskRunner>& blocking_task_runner);
virtual ~DriveUploader();
// DriveUploaderInterface overrides.
diff --git a/google_apis/drive/request_sender.cc b/google_apis/drive/request_sender.cc
index dbf5d85..72c3821 100644
--- a/google_apis/drive/request_sender.cc
+++ b/google_apis/drive/request_sender.cc
@@ -16,7 +16,7 @@ namespace google_apis {
RequestSender::RequestSender(
AuthServiceInterface* auth_service,
net::URLRequestContextGetter* url_request_context_getter,
- base::SequencedTaskRunner* blocking_task_runner,
+ const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
const std::string& custom_user_agent)
: auth_service_(auth_service),
url_request_context_getter_(url_request_context_getter),
diff --git a/google_apis/drive/request_sender.h b/google_apis/drive/request_sender.h
index be76b99..e610d97 100644
--- a/google_apis/drive/request_sender.h
+++ b/google_apis/drive/request_sender.h
@@ -44,10 +44,11 @@ class RequestSender {
//
// |custom_user_agent| will be used for the User-Agent header in HTTP
// requests issued through the request sender if the value is not empty.
- RequestSender(AuthServiceInterface* auth_service,
- net::URLRequestContextGetter* url_request_context_getter,
- base::SequencedTaskRunner* blocking_task_runner,
- const std::string& custom_user_agent);
+ RequestSender(
+ AuthServiceInterface* auth_service,
+ net::URLRequestContextGetter* url_request_context_getter,
+ const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner,
+ const std::string& custom_user_agent);
~RequestSender();
AuthServiceInterface* auth_service() { return auth_service_.get(); }
diff --git a/google_apis/drive/request_sender_unittest.cc b/google_apis/drive/request_sender_unittest.cc
index 20f5402..5ac58f3 100644
--- a/google_apis/drive/request_sender_unittest.cc
+++ b/google_apis/drive/request_sender_unittest.cc
@@ -4,6 +4,7 @@
#include "google_apis/drive/request_sender.h"
+#include "base/sequenced_task_runner.h"
#include "base/strings/string_number_conversions.h"
#include "google_apis/drive/base_requests.h"
#include "google_apis/drive/dummy_auth_service.h"