webshare: Small refactor of WebShare (OnceCallback, const&, and alias)

chrome/browser/webshare/share_service_impl_unittest.cc

 // Copyright 2016 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 <memory>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 67 matching lines @@
   void set_run_loop(base::RunLoop* run_loop) {
     quit_run_loop_ = run_loop->QuitClosure();
   }
 
   const std::string& GetLastUsedTargetURL() { return last_used_target_url_; }
 
   const std::vector<std::pair<base::string16, GURL>>& GetTargetsInPicker() {
     return targets_in_picker_;
   }
 
-  const base::Callback<void(base::Optional<std::string>)>& picker_callback() {
-    return picker_callback_;
+  chrome::WebShareTargetPickerCallback picker_callback() {
+    return std::move(picker_callback_);
   }
 
  private:
   void ShowPickerDialog(
       const std::vector<std::pair<base::string16, GURL>>& targets,
-      const base::Callback<void(base::Optional<std::string>)>& callback)
-      override {
+      chrome::WebShareTargetPickerCallback callback) override {
     // Store the arguments passed to the picker dialog.
     targets_in_picker_ = targets;
-    picker_callback_ = callback;
+    picker_callback_ = std::move(callback);
 
     // Quit the test's run loop. It is the test's responsibility to call the
     // callback, to simulate the user's choice.
     quit_run_loop_.Run();
   }
 
   void OpenTargetURL(const GURL& target_url) override {
     last_used_target_url_ = target_url.spec();
   }
 
   PrefService* GetPrefService() override { return pref_service_.get(); }
 
   blink::mojom::EngagementLevel GetEngagementLevel(const GURL& url) override {
     return engagement_map_[url.spec()];
   }
 
   mojo::Binding<blink::mojom::ShareService> binding_;
   std::unique_ptr<TestingPrefServiceSimple> pref_service_;
 
   std::map<std::string, blink::mojom::EngagementLevel> engagement_map_;
   // Closure to quit the test's run loop.
   base::Closure quit_run_loop_;
 
   // The last URL passed to OpenTargetURL.
   std::string last_used_target_url_;
   // The targets passed to ShowPickerDialog.
   std::vector<std::pair<base::string16, GURL>> targets_in_picker_;
   // The callback passed to ShowPickerDialog (which is supposed to be called
   // with the user's chosen result, or nullopt if cancelled).
-  base::Callback<void(base::Optional<std::string>)> picker_callback_;
+  chrome::WebShareTargetPickerCallback picker_callback_;
 };
 
 class ShareServiceImplUnittest : public ChromeRenderViewHostTestHarness {
  public:
   ShareServiceImplUnittest() = default;
   ~ShareServiceImplUnittest() override = default;
 
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 
@@ skipping 196 matching lines @@
   base::Callback<void(blink::mojom::ShareError)> callback =
       base::Bind([](blink::mojom::ShareError error) { FAIL(); });
   share_service()->Share(kTitle, kText, url, callback);
 
   run_loop.Run();
 
   const std::vector<std::pair<base::string16, GURL>> kExpectedTargets{
       make_pair(base::UTF8ToUTF16(kTargetName), GURL(kManifestUrlLow))};
   EXPECT_EQ(kExpectedTargets, share_service_helper()->GetTargetsInPicker());
 
-  const base::Callback<void(base::Optional<std::string>)> picker_callback =
+  chrome::WebShareTargetPickerCallback picker_callback =
       share_service_helper()->picker_callback();
 
   DeleteShareService();
 
   // Pick example-low.com.
-  picker_callback.Run(base::Optional<std::string>(kManifestUrlLow));
+  std::move(picker_callback).Run(base::Optional<std::string>(kManifestUrlLow));
 }
 
 // Replace various numbers of placeholders in various orders. Placeholders are
 // adjacent to eachother; there are no padding characters.
 TEST_F(ShareServiceImplUnittest, ReplacePlaceholders) {
   const GURL url(kUrlSpec);
   std::string url_template_filled;
   bool succeeded;
 
   // No placeholders
@@ skipping 185 matching lines @@
   EXPECT_TRUE(succeeded);
   EXPECT_EQ("%C3%A9", url_template_filled);
 
   // U+1F4A9
   url_template = "{title}";
   succeeded = ShareServiceImpl::ReplacePlaceholders(
       url_template, "\xf0\x9f\x92\xa9", kText, url, &url_template_filled);
   EXPECT_TRUE(succeeded);
   EXPECT_EQ("%F0%9F%92%A9", url_template_filled);
 }