Convert PrivetURLFetcher::TokenCallback to OnceCallback.

Also mark some PrivetJSONOperation::ResultCallback usage as
RepeatingCallback, as determined earlier in r515600.

Change-Id: I88e8389b6967dabaef036446814d1f70e1ab61e4
Reviewed-on: https://chromium-review.googlesource.com/804753
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521620}

chrome/browser/printing/cloud_print/privet_http.h

@@ -61,7 +61,7 @@ class PrivetHTTPClient {
       PrivetURLFetcher::Delegate* delegate) = 0;
 
   virtual void RefreshPrivetToken(
-      const PrivetURLFetcher::TokenCallback& token_callback) = 0;
+      PrivetURLFetcher::TokenCallback token_callback) = 0;
 };
 
 class PrivetDataReadOperation {

chrome/browser/printing/cloud_print/privet_http_impl.cc

@@ -218,8 +218,8 @@ void PrivetRegisterOperationImpl::OnParsedJson(
 }
 
 void PrivetRegisterOperationImpl::OnNeedPrivetToken(
-    const PrivetURLFetcher::TokenCallback& callback) {
-  privet_client_->RefreshPrivetToken(callback);
+    PrivetURLFetcher::TokenCallback callback) {
+  privet_client_->RefreshPrivetToken(std::move(callback));
 }
 
 void PrivetRegisterOperationImpl::SendRequest(const std::string& action) {
@@ -297,9 +297,8 @@ void PrivetRegisterOperationImpl::OnPrivetInfoDone(
 }
 
 void PrivetRegisterOperationImpl::StartInfoOperation() {
-  info_operation_ = privet_client_->CreateInfoOperation(
-      base::Bind(&PrivetRegisterOperationImpl::OnPrivetInfoDone,
-                 base::Unretained(this)));
+  info_operation_ = privet_client_->CreateInfoOperation(base::BindRepeating(
+      &PrivetRegisterOperationImpl::OnPrivetInfoDone, base::Unretained(this)));
   info_operation_->Start();
 }
 
@@ -369,8 +368,8 @@ void PrivetJSONOperationImpl::OnParsedJson(PrivetURLFetcher* fetcher,
 }
 
 void PrivetJSONOperationImpl::OnNeedPrivetToken(
-    const PrivetURLFetcher::TokenCallback& callback) {
-  privet_client_->RefreshPrivetToken(callback);
+    PrivetURLFetcher::TokenCallback callback) {
+  privet_client_->RefreshPrivetToken(std::move(callback));
 }
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
@@ -395,8 +394,8 @@ void PrivetLocalPrintOperationImpl::Start() {
   // We need to get the /info response so we can know which APIs are available.
   // TODO(noamsml): Use cached info when available.
   info_operation_ = privet_client_->CreateInfoOperation(
-      base::Bind(&PrivetLocalPrintOperationImpl::OnPrivetInfoDone,
-                 base::Unretained(this)));
+      base::BindRepeating(&PrivetLocalPrintOperationImpl::OnPrivetInfoDone,
+                          base::Unretained(this)));
   info_operation_->Start();
 
   started_ = true;
@@ -621,8 +620,8 @@ void PrivetLocalPrintOperationImpl::OnParsedJson(
 }
 
 void PrivetLocalPrintOperationImpl::OnNeedPrivetToken(
-    const PrivetURLFetcher::TokenCallback& callback) {
-  privet_client_->RefreshPrivetToken(callback);
+    PrivetURLFetcher::TokenCallback callback) {
+  privet_client_->RefreshPrivetToken(std::move(callback));
 }
 
 void PrivetLocalPrintOperationImpl::SetData(
@@ -722,35 +721,32 @@ std::unique_ptr<PrivetURLFetcher> PrivetHTTPClientImpl::CreateURLFetcher(
 }
 
 void PrivetHTTPClientImpl::RefreshPrivetToken(
-    const PrivetURLFetcher::TokenCallback& callback) {
-  token_callbacks_.push_back(callback);
-
-  if (!info_operation_) {
-    info_operation_ = CreateInfoOperation(
-        base::Bind(&PrivetHTTPClientImpl::OnPrivetInfoDone,
-                   base::Unretained(this)));
-    info_operation_->Start();
-  }
+    PrivetURLFetcher::TokenCallback callback) {
+  token_callbacks_.push_back(std::move(callback));
+
+  if (info_operation_)
+    return;
+
+  info_operation_ = CreateInfoOperation(base::BindRepeating(
+      &PrivetHTTPClientImpl::OnPrivetInfoDone, base::Unretained(this)));
+  info_operation_->Start();
 }
 
 void PrivetHTTPClientImpl::OnPrivetInfoDone(
     const base::DictionaryValue* value) {
   info_operation_.reset();
-  std::string token;
 
   // If this does not succeed, token will be empty, and an empty string
   // is our sentinel value, since empty X-Privet-Tokens are not allowed.
-  if (value) {
+  std::string token;
+  if (value)
     value->GetString(kPrivetInfoKeyToken, &token);
-  }
 
   TokenCallbackVector token_callbacks;
   token_callbacks_.swap(token_callbacks);
 
-  for (TokenCallbackVector::iterator i = token_callbacks.begin();
-       i != token_callbacks.end(); i++) {
-    i->Run(token);
-  }
+  for (auto& callback : token_callbacks)
+    std::move(callback).Run(token);
 }
 
 PrivetV1HTTPClientImpl::PrivetV1HTTPClientImpl(

chrome/browser/printing/cloud_print/privet_http_impl.h

@@ -65,8 +65,7 @@ class PrivetRegisterOperationImpl
                     const base::DictionaryValue& value,
                     bool has_error) override;
 
-  void OnNeedPrivetToken(
-      const PrivetURLFetcher::TokenCallback& callback) override;
+  void OnNeedPrivetToken(PrivetURLFetcher::TokenCallback callback) override;
 
   PrivetHTTPClient* GetHTTPClient() override;
 
@@ -131,8 +130,7 @@ class PrivetJSONOperationImpl : public PrivetJSONOperation,
   void OnParsedJson(PrivetURLFetcher* fetcher,
                     const base::DictionaryValue& value,
                     bool has_error) override;
-  void OnNeedPrivetToken(
-      const PrivetURLFetcher::TokenCallback& callback) override;
+  void OnNeedPrivetToken(PrivetURLFetcher::TokenCallback callback) override;
 
  private:
   PrivetHTTPClient* privet_client_;
@@ -170,8 +168,7 @@ class PrivetLocalPrintOperationImpl
   void OnParsedJson(PrivetURLFetcher* fetcher,
                     const base::DictionaryValue& value,
                     bool has_error) override;
-  void OnNeedPrivetToken(
-      const PrivetURLFetcher::TokenCallback& callback) override;
+  void OnNeedPrivetToken(PrivetURLFetcher::TokenCallback callback) override;
 
  private:
   typedef base::Callback<void(bool, const base::DictionaryValue* value)>
@@ -239,10 +236,10 @@ class PrivetHTTPClientImpl : public PrivetHTTPClient {
       net::URLFetcher::RequestType request_type,
       PrivetURLFetcher::Delegate* delegate) override;
   void RefreshPrivetToken(
-      const PrivetURLFetcher::TokenCallback& token_callback) override;
+      PrivetURLFetcher::TokenCallback token_callback) override;
 
  private:
-  typedef std::vector<PrivetURLFetcher::TokenCallback> TokenCallbackVector;
+  using TokenCallbackVector = std::vector<PrivetURLFetcher::TokenCallback>;
 
   void OnPrivetInfoDone(const base::DictionaryValue* value);
 

chrome/browser/printing/cloud_print/privet_http_unittest.cc

@@ -1056,9 +1056,8 @@ class PrivetHttpWithServerTest : public ::testing::Test,
         "test", server_->host_port_pair(), context_getter_);
   }
 
-  void OnNeedPrivetToken(
-      const PrivetURLFetcher::TokenCallback& callback) override {
-    callback.Run("abc");
+  void OnNeedPrivetToken(PrivetURLFetcher::TokenCallback callback) override {
+    std::move(callback).Run("abc");
   }
 
   void OnError(int response_code, PrivetURLFetcher::ErrorType error) override {

chrome/browser/printing/cloud_print/privet_url_fetcher.cc

@@ -58,8 +58,7 @@ std::string MakeRangeHeader(int start, int end) {
 
 }  // namespace
 
-void PrivetURLFetcher::Delegate::OnNeedPrivetToken(
-    const TokenCallback& callback) {
+void PrivetURLFetcher::Delegate::OnNeedPrivetToken(TokenCallback callback) {
   OnError(0, TOKEN_ERROR);
 }
 

chrome/browser/printing/cloud_print/privet_url_fetcher.h

@@ -38,7 +38,7 @@ class PrivetURLFetcher : public net::URLFetcherDelegate {
     UNKNOWN_ERROR,
   };
 
-  typedef base::Callback<void(const std::string& /*token*/)> TokenCallback;
+  using TokenCallback = base::OnceCallback<void(const std::string& /*token*/)>;
 
   class Delegate {
    public:
@@ -46,7 +46,7 @@ class PrivetURLFetcher : public net::URLFetcherDelegate {
 
     // If you do not implement this method for PrivetV1 callers, you will always
     // get a TOKEN_ERROR error when your token is invalid.
-    virtual void OnNeedPrivetToken(const TokenCallback& callback);
+    virtual void OnNeedPrivetToken(TokenCallback callback);
 
     // |response_code| is only needed for RESPONSE_CODE_ERROR.
     virtual void OnError(int response_code, ErrorType error) = 0;

chrome/browser/printing/cloud_print/privet_url_fetcher_unittest.cc

@@ -55,9 +55,7 @@ class MockPrivetURLFetcherDelegate : public PrivetURLFetcher::Delegate {
 
   MOCK_METHOD1(OnParsedJsonInternal, void(bool has_error));
 
-  virtual void OnNeedPrivetToken(
-      const PrivetURLFetcher::TokenCallback& callback) {
-  }
+  virtual void OnNeedPrivetToken(PrivetURLFetcher::TokenCallback callback) {}
 
   bool OnRawData(bool response_is_file,
                  const std::string& data,