[Code Health] Convert Bind/Callback to Once/Repeating.

`ImageDecoder::StartWithOptionsImpl`, binds to the image decode
success and error callback with `BindOnce`.  This means that the
`ClipboardImageDataDecoder` methods `OnImageDecoded` and
`OnImageFailed` will also only by called once, and so the
`ClipboardExtensionHelper` can therefore store the callbacks as
`OnceCallback`s.

All other changes are purely mechanical.  For example, the method
`CountryComboboxModel::SetCountries` accepts a `RepeatingCallback`.
Previously the callback passed in `GenerateCountryList` was
implicitly converted to a `RepeatingCallback` from a `Callback`.
This makes it explicit.

Bug: 1007786
Change-Id: I5b09978da57ea1df2ff1e672a5db735ab677e965
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2321541Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: Terrence Reilly <treilly@google.com>
Cr-Commit-Position: refs/heads/master@{#795002}

chrome/browser/extensions/active_tab_apitest.cc

@@ -51,7 +51,6 @@ class ExtensionActiveTabTest : public ExtensionApiTest {
   }
 
  private:
-
   DISALLOW_COPY_AND_ASSIGN(ExtensionActiveTabTest);
 };
 
@@ -251,7 +250,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FileURLs) {
     // Sanity check the last committed url on the |file_iframe|.
     content::RenderFrameHost* file_iframe = content::FrameMatchingPredicate(
         browser()->tab_strip_model()->GetActiveWebContents(),
-        base::Bind(&content::FrameMatchesName, "file_iframe"));
+        base::BindRepeating(&content::FrameMatchesName, "file_iframe"));
     bool is_file_url = file_iframe->GetLastCommittedURL() == GURL("file:///");
     EXPECT_EQ(allowed, is_file_url)
         << "Unexpected committed url: "

chrome/browser/extensions/active_tab_permission_granter.cc

@@ -30,7 +30,7 @@ namespace extensions {
 
 namespace {
 
-using CreateMessageFunction = base::Callback<IPC::Message*(bool)>;
+using CreateMessageFunction = base::RepeatingCallback<IPC::Message*(bool)>;
 
 // Creates a new IPC message for updating tab-specific permissions.
 IPC::Message* CreateUpdateMessage(const GURL& visible_url,
@@ -177,7 +177,7 @@ void ActiveTabPermissionGranter::GrantIfRequested(const Extension* extension) {
       // We update all extension render views with the new tab permissions, and
       // also the tab itself.
       CreateMessageFunction update_message =
-          base::Bind(&CreateUpdateMessage, navigation_entry->GetURL(),
+          base::BindRepeating(&CreateUpdateMessage, navigation_entry->GetURL(),
                               extension->id(), new_hosts.Clone(), tab_id_);
       SendMessageToProcesses(
           process_manager->GetRenderFrameHostsForExtension(extension->id()),
@@ -253,7 +253,7 @@ void ActiveTabPermissionGranter::ClearActiveExtensionsAndNotify() {
   }
 
   CreateMessageFunction clear_message =
-      base::Bind(&CreateClearMessage, extension_ids, tab_id_);
+      base::BindRepeating(&CreateClearMessage, extension_ids, tab_id_);
   SendMessageToProcesses(
       frame_hosts, web_contents()->GetMainFrame()->GetProcess(), clear_message);
 

chrome/browser/extensions/activity_log/activity_database.cc

@@ -59,9 +59,8 @@ void ActivityDatabase::Init(const base::FilePath& db_name) {
   did_init_ = true;
   DCHECK(GetActivityLogTaskRunner()->RunsTasksInCurrentSequence());
   db_.set_histogram_tag("Activity");
-  db_.set_error_callback(
-      base::Bind(&ActivityDatabase::DatabaseErrorCallback,
-                 base::Unretained(this)));
+  db_.set_error_callback(base::BindRepeating(
+      &ActivityDatabase::DatabaseErrorCallback, base::Unretained(this)));
   db_.set_page_size(4096);
   db_.set_cache_size(32);
 

chrome/browser/extensions/activity_log/counting_policy_unittest.cc

@@ -112,7 +112,7 @@ class CountingPolicyTest : public testing::Test {
     // Set up a timeout for receiving results; if we haven't received anything
     // when the timeout triggers then assume that the test is broken.
     base::CancelableClosure timeout(
-        base::Bind(&CountingPolicyTest::TimeoutCallback));
+        base::BindRepeating(&CountingPolicyTest::TimeoutCallback));
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE, timeout.callback(), TestTimeouts::action_timeout());
 

chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc

@@ -70,8 +70,8 @@ class ActivityLogApiTest : public ExtensionApiTest {
 IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, MAYBE_TriggerEvent) {
   ActivityLog::GetInstance(profile())->SetWatchdogAppActiveForTesting(true);
 
-  embedded_test_server()->RegisterRequestHandler(
-      base::Bind(&ActivityLogApiTest::HandleRequest, base::Unretained(this)));
+  embedded_test_server()->RegisterRequestHandler(base::BindRepeating(
+      &ActivityLogApiTest::HandleRequest, base::Unretained(this)));
   ASSERT_TRUE(StartEmbeddedTestServer());
 
   const Extension* friend_extension = LoadExtensionIncognito(

chrome/browser/extensions/api/autofill_private/autofill_util.cc

@@ -200,7 +200,8 @@ AddressEntryList GenerateAddressList(
 CountryEntryList GenerateCountryList(
     const autofill::PersonalDataManager& personal_data) {
   autofill::CountryComboboxModel model;
-  model.SetCountries(personal_data, base::Callback<bool(const std::string&)>(),
+  model.SetCountries(personal_data,
+                     base::RepeatingCallback<bool(const std::string&)>(),
                      g_browser_process->GetApplicationLocale());
   const std::vector<std::unique_ptr<autofill::AutofillCountry>>& countries =
       model.countries();

chrome/browser/extensions/api/chrome_extensions_api_client.cc

@@ -408,13 +408,13 @@ void ChromeExtensionsAPIClient::SaveImageDataToClipboard(
     const std::vector<char>& image_data,
     api::clipboard::ImageType type,
     AdditionalDataItemList additional_items,
-    const base::Closure& success_callback,
-    const base::Callback<void(const std::string&)>& error_callback) {
+    base::OnceClosure success_callback,
+    base::OnceCallback<void(const std::string&)> error_callback) {
   if (!clipboard_extension_helper_)
     clipboard_extension_helper_ = std::make_unique<ClipboardExtensionHelper>();
   clipboard_extension_helper_->DecodeAndSaveImageData(
-      image_data, type, std::move(additional_items), success_callback,
-      error_callback);
+      image_data, type, std::move(additional_items),
+      std::move(success_callback), std::move(error_callback));
 }
 #endif
 

chrome/browser/extensions/api/chrome_extensions_api_client.h

@@ -86,8 +86,8 @@ class ChromeExtensionsAPIClient : public ExtensionsAPIClient {
       const std::vector<char>& image_data,
       api::clipboard::ImageType type,
       AdditionalDataItemList additional_items,
-      const base::Closure& success_callback,
-      const base::Callback<void(const std::string&)>& error_callback) override;
+      base::OnceClosure success_callback,
+      base::OnceCallback<void(const std::string&)> error_callback) override;
 #endif
 
   AutomationInternalApiDelegate* GetAutomationInternalApiDelegate() override;

chrome/browser/extensions/clipboard_extension_helper_chromeos.cc

@@ -85,8 +85,8 @@ void ClipboardExtensionHelper::DecodeAndSaveImageData(
     const std::vector<char>& data,
     clipboard::ImageType type,
     AdditionalDataItemList additional_items,
-    const base::Closure& success_callback,
-    const base::Callback<void(const std::string&)>& error_callback) {
+    base::OnceClosure success_callback,
+    base::OnceCallback<void(const std::string&)> error_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // If there is a previous image decoding request still running, cancel it
@@ -99,8 +99,8 @@ void ClipboardExtensionHelper::DecodeAndSaveImageData(
   // Cache additonal items.
   additonal_items_ = std::move(additional_items);
 
-  image_save_success_callback_ = success_callback;
-  image_save_error_callback_ = error_callback;
+  image_save_success_callback_ = std::move(success_callback);
+  image_save_error_callback_ = std::move(error_callback);
   clipboard_image_data_decoder_->Start(data, type);
 }
 

chrome/browser/extensions/clipboard_extension_helper_chromeos.h

@@ -28,8 +28,8 @@ class ClipboardExtensionHelper {
       const std::vector<char>& data,
       api::clipboard::ImageType type,
       AdditionalDataItemList additional_items,
-      const base::Closure& success_callback,
-      const base::Callback<void(const std::string&)>& error_callback);
+      base::OnceClosure success_callback,
+      base::OnceCallback<void(const std::string&)> error_callback);
 
  private:
   // A class to decode PNG and JPEG file.
@@ -43,8 +43,8 @@ class ClipboardExtensionHelper {
   void OnImageDecodeCancel();
 
   std::unique_ptr<ClipboardImageDataDecoder> clipboard_image_data_decoder_;
-  base::Closure image_save_success_callback_;
-  base::Callback<void(const std::string&)> image_save_error_callback_;
+  base::OnceClosure image_save_success_callback_;
+  base::OnceCallback<void(const std::string&)> image_save_error_callback_;
   AdditionalDataItemList additonal_items_;
 
   DISALLOW_COPY_AND_ASSIGN(ClipboardExtensionHelper);

extensions/browser/api/clipboard/clipboard_api.cc

@@ -67,8 +67,10 @@ ExtensionFunction::ResponseAction ClipboardSetImageDataFunction::Run() {
   ExtensionsAPIClient::Get()->SaveImageDataToClipboard(
       std::vector<char>(params->image_data.begin(), params->image_data.end()),
       params->type, std::move(*params->additional_items),
-      base::Bind(&ClipboardSetImageDataFunction::OnSaveImageDataSuccess, this),
-      base::Bind(&ClipboardSetImageDataFunction::OnSaveImageDataError, this));
+      base::BindOnce(&ClipboardSetImageDataFunction::OnSaveImageDataSuccess,
+                     this),
+      base::BindOnce(&ClipboardSetImageDataFunction::OnSaveImageDataError,
+                     this));
   return RespondLater();
 }
 

extensions/browser/api/extensions_api_client.cc

@@ -166,8 +166,8 @@ void ExtensionsAPIClient::SaveImageDataToClipboard(
     const std::vector<char>& image_data,
     api::clipboard::ImageType type,
     AdditionalDataItemList additional_items,
-    const base::Closure& success_callback,
-    const base::Callback<void(const std::string&)>& error_callback) {}
+    base::OnceClosure success_callback,
+    base::OnceCallback<void(const std::string&)> error_callback) {}
 #endif
 
 AutomationInternalApiDelegate*

extensions/browser/api/extensions_api_client.h

@@ -208,8 +208,8 @@ class ExtensionsAPIClient {
       const std::vector<char>& image_data,
       api::clipboard::ImageType type,
       AdditionalDataItemList additional_items,
-      const base::Closure& success_callback,
-      const base::Callback<void(const std::string&)>& error_callback);
+      base::OnceClosure success_callback,
+      base::OnceCallback<void(const std::string&)> error_callback);
 #endif
 
   virtual AutomationInternalApiDelegate* GetAutomationInternalApiDelegate();