Convert base::Bind etc in components/ (1/n)

This covers removal of deprecated base::Bind, base::Callback,
base::Closure, base::Passed across the following components/
subdirectories:

- components/sync_sessions/
- components/translate/
- components/update_client/

Fixed: 1007743,1007746,1007748
Change-Id: Ie8d5c8267ac125b903ba04443d031e8134122dd9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1970293Reviewed-by: Sorin Jianu <sorin@chromium.org>
Reviewed-by: John Wu <jzw@chromium.org>
Reviewed-by: vitaliii <vitaliii@chromium.org>
Commit-Queue: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#726107}

components/sync_sessions/favicon_cache.cc

@@ -446,8 +446,8 @@ void FaviconCache::OnPageFaviconUpdated(const GURL& page_url,
   base::CancelableTaskTracker::TaskId id =
       favicon_service_->GetFaviconForPageURL(
           page_url, SupportedFaviconTypes(), kMaxFaviconResolution,
-          base::Bind(&FaviconCache::OnFaviconDataAvailable,
-                     weak_ptr_factory_.GetWeakPtr(), page_url, mtime),
+          base::BindOnce(&FaviconCache::OnFaviconDataAvailable,
+                         weak_ptr_factory_.GetWeakPtr(), page_url, mtime),
           &cancelable_task_tracker_);
   page_task_map_[page_url] = id;
 }

components/translate/core/browser/translate_accept_languages.cc

@@ -27,13 +27,11 @@ TranslateAcceptLanguages::TranslateAcceptLanguages(
   pref_change_registrar_.Init(prefs);
   pref_change_registrar_.Add(
       accept_languages_pref,
-      base::Bind(&TranslateAcceptLanguages::InitAcceptLanguages,
-                 base::Unretained(this),
-                 prefs));
+      base::BindRepeating(&TranslateAcceptLanguages::InitAcceptLanguages,
+                          base::Unretained(this), prefs));
 }
 
-TranslateAcceptLanguages::~TranslateAcceptLanguages() {
-}
+TranslateAcceptLanguages::~TranslateAcceptLanguages() {}
 
 // static
 bool TranslateAcceptLanguages::CanBeAcceptLanguage(
@@ -60,9 +58,9 @@ void TranslateAcceptLanguages::InitAcceptLanguages(PrefService* prefs) {
   // Build the languages.
   accept_languages_.clear();
   std::string accept_languages_pref = prefs->GetString(accept_languages_pref_);
-  for (const base::StringPiece& lang : base::SplitStringPiece(
-           accept_languages_pref, ",",
-           base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
+  for (const base::StringPiece& lang :
+       base::SplitStringPiece(accept_languages_pref, ",", base::TRIM_WHITESPACE,
+                              base::SPLIT_WANT_ALL)) {
     // Get rid of the locale extension if any (ex: en-US -> en), but for Chinese
     // for which the CLD reports zh-CN and zh-TW.
     size_t index = lang.find('-');

components/translate/core/browser/translate_language_list.h

@@ -55,7 +55,8 @@ class TranslateLanguageList {
   // pending request.
   void SetResourceRequestsAllowed(bool allowed);
 
-  typedef base::Callback<void(const TranslateEventDetails&)> EventCallback;
+  typedef base::RepeatingCallback<void(const TranslateEventDetails&)>
+      EventCallback;
   typedef base::CallbackList<void(const TranslateEventDetails&)>
       EventCallbackList;
 

components/translate/core/browser/translate_manager.cc

@@ -310,10 +310,10 @@ void TranslateManager::TranslatePage(const std::string& original_source_lang,
   // The script is not available yet.  Queue that request and query for the
   // script.  Once it is downloaded we'll do the translate.
   TranslateScript::RequestCallback callback =
-      base::Bind(&TranslateManager::OnTranslateScriptFetchComplete,
-                 GetWeakPtr(), source_lang, target_lang);
+      base::BindOnce(&TranslateManager::OnTranslateScriptFetchComplete,
+                     GetWeakPtr(), source_lang, target_lang);
 
-  script->Request(callback, translate_driver_->IsIncognito());
+  script->Request(std::move(callback), translate_driver_->IsIncognito());
 }
 
 void TranslateManager::RevertTranslation() {

components/translate/core/browser/translate_ranker_impl.cc

@@ -167,9 +167,9 @@ TranslateRankerImpl::TranslateRankerImpl(const base::FilePath& model_path,
               translate::kTranslateRankerPreviousLanguageMatchesOverride)) {
   if (is_query_enabled_ || is_enforcement_enabled_) {
     model_loader_ = std::make_unique<assist_ranker::RankerModelLoaderImpl>(
-        base::Bind(&ValidateModel),
-        base::Bind(&TranslateRankerImpl::OnModelAvailable,
-                   weak_ptr_factory_.GetWeakPtr()),
+        base::BindRepeating(&ValidateModel),
+        base::BindRepeating(&TranslateRankerImpl::OnModelAvailable,
+                            weak_ptr_factory_.GetWeakPtr()),
         TranslateDownloadManager::GetInstance()->url_loader_factory(),
         model_path, model_url, kUmaPrefix);
     // Kick off the initial load from cache.

components/translate/core/browser/translate_script.cc

@@ -54,15 +54,13 @@ const char kServerParams[] = "server_params";
 TranslateScript::TranslateScript()
     : expiration_delay_(base::TimeDelta::FromDays(kExpirationDelayDays)) {}
 
-TranslateScript::~TranslateScript() {
-}
+TranslateScript::~TranslateScript() {}
 
-void TranslateScript::Request(const RequestCallback& callback,
-                              bool is_incognito) {
+void TranslateScript::Request(RequestCallback callback, bool is_incognito) {
   script_fetch_start_time_ = base::Time::Now().ToJsTime();
 
   DCHECK(data_.empty()) << "Do not fetch the script if it is already fetched";
-  callback_list_.push_back(callback);
+  callback_list_.push_back(std::move(callback));
 
   if (fetcher_) {
     // If there is already a request in progress, do nothing. |callback| will be
@@ -104,20 +102,14 @@ GURL TranslateScript::GetTranslateScriptURL() {
     translate_script_url = GURL(kScriptURL);
 
   translate_script_url = net::AppendQueryParameter(
-      translate_script_url,
-      kCallbackQueryName,
-      kCallbackQueryValue);
+      translate_script_url, kCallbackQueryName, kCallbackQueryValue);
   translate_script_url = net::AppendQueryParameter(
-      translate_script_url,
-      kAlwaysUseSslQueryName,
-      kAlwaysUseSslQueryValue);
+      translate_script_url, kAlwaysUseSslQueryName, kAlwaysUseSslQueryValue);
   translate_script_url = net::AppendQueryParameter(
-      translate_script_url,
-      kCssLoaderCallbackQueryName,
+      translate_script_url, kCssLoaderCallbackQueryName,
       kCssLoaderCallbackQueryValue);
   translate_script_url = net::AppendQueryParameter(
-      translate_script_url,
-      kJavascriptLoaderCallbackQueryName,
+      translate_script_url, kJavascriptLoaderCallbackQueryName,
       kJavascriptLoaderCallbackQueryValue);
 
   translate_script_url = AddHostLocaleToUrl(translate_script_url);
@@ -150,8 +142,8 @@ void TranslateScript::OnScriptFetchComplete(bool success,
                         server_params.c_str());
 
     GURL security_origin = translate::GetTranslateSecurityOrigin();
-    base::StringAppendF(
-        &data_, "var securityOrigin = '%s';", security_origin.spec().c_str());
+    base::StringAppendF(&data_, "var securityOrigin = '%s';",
+                        security_origin.spec().c_str());
 
     // Load embedded translate.js.
     data_.append(ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
@@ -185,9 +177,8 @@ void TranslateScript::OnScriptFetchComplete(bool success,
         expiration_delay_);
   }
 
-  for (auto it = callback_list_.begin(); it != callback_list_.end(); ++it) {
-    it->Run(success, data);
-  }
+  for (auto& callback : callback_list_)
+    std::move(callback).Run(success, data);
   callback_list_.clear();
 }
 

components/translate/core/browser/translate_script.h

@@ -24,7 +24,7 @@ class TranslateURLFetcher;
 
 class TranslateScript {
  public:
-  typedef base::Callback<void(bool, const std::string&)> RequestCallback;
+  using RequestCallback = base::OnceCallback<void(bool, const std::string&)>;
 
   TranslateScript();
   virtual ~TranslateScript();
@@ -45,7 +45,7 @@ class TranslateScript {
   // Fetches the JS translate script (the script that is injected in the page
   // to translate it). |is_incognito| is used during the fetch to determine
   // which variations headers to add.
-  void Request(const RequestCallback& callback, bool is_incognito);
+  void Request(RequestCallback callback, bool is_incognito);
 
   // Returns the URL to be used to load the translate script.
   static GURL GetTranslateScriptURL();

components/translate/ios/browser/js_language_detection_manager.h

@@ -19,7 +19,8 @@ namespace language_detection {
 extern const size_t kMaxIndexChars;
 
 // Type for the callback called when the buffered text is retrieved.
-using BufferedTextCallback = base::Callback<void(const base::string16&)>;
+using BufferedTextCallback =
+    base::RepeatingCallback<void(const base::string16&)>;
 
 }  // namespace language_detection
 
@@ -30,7 +31,7 @@ using BufferedTextCallback = base::Callback<void(const base::string16&)>;
 // |callback| with the page's text contents. The cache is purged on the JS side
 // after this call. |callback| must be non null.
 - (void)retrieveBufferedTextContent:
-        (const language_detection::BufferedTextCallback&)callback;
+    (const language_detection::BufferedTextCallback&)callback;
 
 // Starts detecting the language of the page.
 - (void)startLanguageDetection;

components/translate/ios/browser/language_detection_controller.mm

@@ -47,8 +47,8 @@ LanguageDetectionController::LanguageDetectionController(
   translate_enabled_.Init(prefs::kOfferTranslateEnabled, prefs);
   web_state_->AddObserver(this);
   subscription_ = web_state_->AddScriptCommandCallback(
-      base::Bind(&LanguageDetectionController::OnTextCaptured,
-                 base::Unretained(this)),
+      base::BindRepeating(&LanguageDetectionController::OnTextCaptured,
+                          base::Unretained(this)),
       kCommandPrefix);
 }
 
@@ -110,8 +110,9 @@ void LanguageDetectionController::OnTextCaptured(
   if (http_content_language.empty())
     http_content_language = content_language_header_;
 
-  [js_manager_ retrieveBufferedTextContent:
-                   base::Bind(&LanguageDetectionController::OnTextRetrieved,
+  [js_manager_
+      retrieveBufferedTextContent:
+          base::BindRepeating(&LanguageDetectionController::OnTextRetrieved,
                               weak_method_factory_.GetWeakPtr(),
                               http_content_language, html_lang, url)];
 }

components/translate/ios/browser/translate_controller.mm

@@ -49,7 +49,7 @@ TranslateController::TranslateController(web::WebState* web_state,
   DCHECK(web_state_);
   web_state_->AddObserver(this);
   subscription_ = web_state_->AddScriptCommandCallback(
-      base::Bind(
+      base::BindRepeating(
           [](TranslateController* ptr, const base::DictionaryValue& command,
              const GURL& page_url, bool user_is_interacting,
              web::WebFrame* sender_frame) {

components/update_client/component.cc

@@ -629,8 +629,8 @@ void Component::StateDownloadingDiff::DoHandle() {
 
   const auto& id = component.id_;
   crx_downloader_->set_progress_callback(
-      base::Bind(&Component::StateDownloadingDiff::DownloadProgress,
-                 base::Unretained(this), id));
+      base::BindRepeating(&Component::StateDownloadingDiff::DownloadProgress,
+                          base::Unretained(this), id));
   crx_downloader_->StartDownload(
       component.crx_diffurls_, component.hashdiff_sha256_,
       base::BindOnce(&Component::StateDownloadingDiff::DownloadComplete,
@@ -694,8 +694,8 @@ void Component::StateDownloading::DoHandle() {
 
   const auto& id = component.id_;
   crx_downloader_->set_progress_callback(
-      base::Bind(&Component::StateDownloading::DownloadProgress,
-                 base::Unretained(this), id));
+      base::BindRepeating(&Component::StateDownloading::DownloadProgress,
+                          base::Unretained(this), id));
   crx_downloader_->StartDownload(
       component.crx_urls_, component.hash_sha256_,
       base::BindOnce(&Component::StateDownloading::DownloadComplete,

components/update_client/crx_downloader_unittest.cc

@@ -103,9 +103,10 @@ CrxDownloaderTest::CrxDownloaderTest()
     : callback_(base::BindOnce(&CrxDownloaderTest::DownloadComplete,
                                base::Unretained(this),
                                kExpectedContext)),
-      progress_callback_(base::Bind(&CrxDownloaderTest::DownloadProgress,
-                                    base::Unretained(this),
-                                    kExpectedContext)),
+      progress_callback_(
+          base::BindRepeating(&CrxDownloaderTest::DownloadProgress,
+                              base::Unretained(this),
+                              kExpectedContext)),
       crx_context_(0),
       num_download_complete_calls_(0),
       num_progress_calls_(0),

components/update_client/update_client.cc

@@ -69,8 +69,8 @@ UpdateClientImpl::UpdateClientImpl(
           update_checker_factory,
           crx_downloader_factory,
           ping_manager_.get(),
-          base::Bind(&UpdateClientImpl::NotifyObservers,
-                     base::Unretained(this)))) {}
+          base::BindRepeating(&UpdateClientImpl::NotifyObservers,
+                              base::Unretained(this)))) {}
 
 UpdateClientImpl::~UpdateClientImpl() {
   DCHECK(thread_checker_.CalledOnValidThread());

components/update_client/update_engine.h

@@ -41,8 +41,8 @@ class UpdateEngine : public base::RefCounted<UpdateEngine> {
  public:
   using Callback = base::OnceCallback<void(Error error)>;
   using NotifyObserversCallback =
-      base::Callback<void(UpdateClient::Observer::Events event,
-                          const std::string& id)>;
+      base::RepeatingCallback<void(UpdateClient::Observer::Events event,
+                                   const std::string& id)>;
   using CrxDataCallback = UpdateClient::CrxDataCallback;
 
   UpdateEngine(scoped_refptr<Configurator> config,