Reland "Rename ClipboardURLProvider to ClipboardProvider"

This is a reland of e07980a1

The original CL collided with another one that used this enum case.

Original change's description:
> Rename ClipboardURLProvider to ClipboardProvider
>
> ClipboardURLProvider now provides matches for text and images on the
> clipboard as well as URLs. Therefore, we should rename it to just
> ClipboardProvider.
>
> Bug: 923443
> Change-Id: I43ab8036cf2b0c564ebc3588b4c2324628ab2ee7
> Reviewed-on: https://chromium-review.googlesource.com/c/1445401
> Reviewed-by: Brian White <bcwhite@chromium.org>
> Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
> Commit-Queue: Robbie Gibson <rkgibson@google.com>
> Cr-Commit-Position: refs/heads/master@{#632681}

Bug: 923443
Change-Id: Iccbf43e55637330c2a8817b24386e70c755874b6
Reviewed-on: https://chromium-review.googlesource.com/c/1475758
Commit-Queue: Robbie Gibson <rkgibson@google.com>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Reviewed-by: Brian White <bcwhite@chromium.org>
Cr-Commit-Position: refs/heads/master@{#633768}

components/omnibox/browser/BUILD.gn

@@ -97,8 +97,8 @@ jumbo_static_library("browser") {
     "bookmark_provider.h",
     "builtin_provider.cc",
     "builtin_provider.h",
-    "clipboard_url_provider.cc",
-    "clipboard_url_provider.h",
+    "clipboard_provider.cc",
+    "clipboard_provider.h",
     "contextual_suggestions_service.cc",
     "contextual_suggestions_service.h",
     "document_provider.cc",
@@ -373,7 +373,7 @@ source_set("unit_tests") {
     "base_search_provider_unittest.cc",
     "bookmark_provider_unittest.cc",
     "builtin_provider_unittest.cc",
-    "clipboard_url_provider_unittest.cc",
+    "clipboard_provider_unittest.cc",
     "contextual_suggestions_service_unittest.cc",
     "document_provider_unittest.cc",
     "favicon_cache_unittest.cc",

components/omnibox/browser/OWNERS

-per-file clipboard_url_provider.*=jif@chromium.org
+per-file clipboard_provider.*=jif@chromium.org
 
 # COMPONENT: UI>Browser>Omnibox

components/omnibox/browser/autocomplete_classifier.cc

@@ -43,7 +43,7 @@ int AutocompleteClassifier::DefaultOmniboxProviders() {
 #endif
       AutocompleteProvider::TYPE_ZERO_SUGGEST |
       (base::FeatureList::IsEnabled(omnibox::kEnableClipboardProvider)
-           ? AutocompleteProvider::TYPE_CLIPBOARD_URL
+           ? AutocompleteProvider::TYPE_CLIPBOARD
            : 0) |
       (base::FeatureList::IsEnabled(omnibox::kDocumentProvider)
            ? AutocompleteProvider::TYPE_DOCUMENT

components/omnibox/browser/autocomplete_controller.cc

@@ -29,7 +29,7 @@
 #include "components/omnibox/browser/autocomplete_controller_delegate.h"
 #include "components/omnibox/browser/bookmark_provider.h"
 #include "components/omnibox/browser/builtin_provider.h"
-#include "components/omnibox/browser/clipboard_url_provider.h"
+#include "components/omnibox/browser/clipboard_provider.h"
 #include "components/omnibox/browser/document_provider.h"
 #include "components/omnibox/browser/history_quick_provider.h"
 #include "components/omnibox/browser/history_url_provider.h"
@@ -252,7 +252,7 @@ AutocompleteController::AutocompleteController(
   // history_url_provider_.
   if (provider_types & (AutocompleteProvider::TYPE_HISTORY_URL |
                         AutocompleteProvider::TYPE_ZERO_SUGGEST |
-                        AutocompleteProvider::TYPE_CLIPBOARD_URL)) {
+                        AutocompleteProvider::TYPE_CLIPBOARD)) {
     history_url_provider_ =
         new HistoryURLProvider(provider_client_.get(), this);
     if (provider_types & AutocompleteProvider::TYPE_HISTORY_URL)
@@ -270,7 +270,7 @@ AutocompleteController::AutocompleteController(
     document_provider_ = DocumentProvider::Create(provider_client_.get(), this);
     providers_.push_back(document_provider_);
   }
-  if (provider_types & AutocompleteProvider::TYPE_CLIPBOARD_URL) {
+  if (provider_types & AutocompleteProvider::TYPE_CLIPBOARD) {
 #if !defined(OS_IOS)
     // On iOS, a global ClipboardRecentContent should've been created by now
     // (if enabled).  If none has been created (e.g., we're on a different
@@ -286,7 +286,7 @@ AutocompleteController::AutocompleteController(
     // ClipboardRecentContent can be null in iOS tests.  For non-iOS, we
     // create a ClipboardRecentContent as above (for both Chrome and tests).
     if (ClipboardRecentContent::GetInstance()) {
-      providers_.push_back(new ClipboardURLProvider(
+      providers_.push_back(new ClipboardProvider(
           provider_client_.get(), this, history_url_provider_,
           ClipboardRecentContent::GetInstance()));
     }

components/omnibox/browser/autocomplete_provider.cc

@@ -51,8 +51,8 @@ const char* AutocompleteProvider::TypeToString(Type type) {
       return "Shortcuts";
     case TYPE_ZERO_SUGGEST:
       return "ZeroSuggest";
-    case TYPE_CLIPBOARD_URL:
-      return "ClipboardURL";
+    case TYPE_CLIPBOARD:
+      return "Clipboard";
     default:
       NOTREACHED() << "Unhandled AutocompleteProvider::Type " << type;
       return "Unknown";
@@ -254,8 +254,8 @@ metrics::OmniboxEventProto_ProviderType AutocompleteProvider::
       return metrics::OmniboxEventProto::SHORTCUTS;
     case TYPE_ZERO_SUGGEST:
       return metrics::OmniboxEventProto::ZERO_SUGGEST;
-    case TYPE_CLIPBOARD_URL:
-      return metrics::OmniboxEventProto::CLIPBOARD_URL;
+    case TYPE_CLIPBOARD:
+      return metrics::OmniboxEventProto::CLIPBOARD;
     default:
       NOTREACHED() << "Unhandled AutocompleteProvider::Type " << type_;
       return metrics::OmniboxEventProto::UNKNOWN_PROVIDER;

components/omnibox/browser/autocomplete_provider.h

@@ -140,7 +140,7 @@ class AutocompleteProvider
     TYPE_SEARCH = 1 << 5,
     TYPE_SHORTCUTS = 1 << 6,
     TYPE_ZERO_SUGGEST = 1 << 7,
-    TYPE_CLIPBOARD_URL = 1 << 8,
+    TYPE_CLIPBOARD = 1 << 8,
     TYPE_DOCUMENT = 1 << 9,
   };
 

components/omnibox/browser/clipboard_url_provider.cc → components/omnibox/browser/clipboard_provider.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/omnibox/browser/clipboard_url_provider.h"
+#include "components/omnibox/browser/clipboard_provider.h"
 
 #include <algorithm>
 #include <memory>
@@ -32,12 +32,11 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image_util.h"
 
-ClipboardURLProvider::ClipboardURLProvider(
-    AutocompleteProviderClient* client,
-    AutocompleteProviderListener* listener,
-    HistoryURLProvider* history_url_provider,
-    ClipboardRecentContent* clipboard_content)
-    : AutocompleteProvider(AutocompleteProvider::TYPE_CLIPBOARD_URL),
+ClipboardProvider::ClipboardProvider(AutocompleteProviderClient* client,
+                                     AutocompleteProviderListener* listener,
+                                     HistoryURLProvider* history_url_provider,
+                                     ClipboardRecentContent* clipboard_content)
+    : AutocompleteProvider(AutocompleteProvider::TYPE_CLIPBOARD),
       client_(client),
       listener_(listener),
       clipboard_content_(clipboard_content),
@@ -47,10 +46,10 @@ ClipboardURLProvider::ClipboardURLProvider(
   DCHECK(clipboard_content_);
 }
 
-ClipboardURLProvider::~ClipboardURLProvider() {}
+ClipboardProvider::~ClipboardProvider() {}
 
-void ClipboardURLProvider::Start(const AutocompleteInput& input,
-                                 bool minimal_changes) {
+void ClipboardProvider::Start(const AutocompleteInput& input,
+                              bool minimal_changes) {
   matches_.clear();
 
   // If the user started typing, do not offer clipboard based match.
@@ -75,13 +74,13 @@ void ClipboardURLProvider::Start(const AutocompleteInput& input,
                               clipboard_content_->GetClipboardContentAge());
 }
 
-void ClipboardURLProvider::Stop(bool clear_cached_results,
-                                bool due_to_user_inactivity) {
+void ClipboardProvider::Stop(bool clear_cached_results,
+                             bool due_to_user_inactivity) {
   callback_weak_ptr_factory_.InvalidateWeakPtrs();
   AutocompleteProvider::Stop(clear_cached_results, due_to_user_inactivity);
 }
 
-void ClipboardURLProvider::AddCreatedMatchWithTracking(
+void ClipboardProvider::AddCreatedMatchWithTracking(
     const AutocompleteInput& input,
     const AutocompleteMatch& match,
     const base::TimeDelta clipboard_contents_age) {
@@ -119,7 +118,7 @@ void ClipboardURLProvider::AddCreatedMatchWithTracking(
   matches_.emplace_back(match);
 }
 
-base::Optional<AutocompleteMatch> ClipboardURLProvider::CreateURLMatch(
+base::Optional<AutocompleteMatch> ClipboardProvider::CreateURLMatch(
     const AutocompleteInput& input) {
   // The clipboard does not contain a URL worth suggesting.
   base::Optional<GURL> optional_gurl =
@@ -157,7 +156,7 @@ base::Optional<AutocompleteMatch> ClipboardURLProvider::CreateURLMatch(
   return match;
 }
 
-base::Optional<AutocompleteMatch> ClipboardURLProvider::CreateTextMatch(
+base::Optional<AutocompleteMatch> ClipboardProvider::CreateTextMatch(
     const AutocompleteInput& input) {
   // Only try text match if feature is enabled
   if (!base::FeatureList::IsEnabled(
@@ -208,7 +207,7 @@ base::Optional<AutocompleteMatch> ClipboardURLProvider::CreateTextMatch(
   return match;
 }
 
-bool ClipboardURLProvider::CreateImageMatch(const AutocompleteInput& input) {
+bool ClipboardProvider::CreateImageMatch(const AutocompleteInput& input) {
   // Only try image match if feature is enabled
   if (!base::FeatureList::IsEnabled(
           omnibox::kEnableClipboardProviderImageSuggestions)) {
@@ -239,21 +238,21 @@ bool ClipboardURLProvider::CreateImageMatch(const AutocompleteInput& input) {
   done_ = false;
   PostTaskAndReplyWithResult(
       FROM_HERE,
-      base::BindOnce(&ClipboardURLProvider::EncodeClipboardImage,
+      base::BindOnce(&ClipboardProvider::EncodeClipboardImage,
                      optional_image.value()),
-      base::BindOnce(&ClipboardURLProvider::ConstructImageMatchCallback,
+      base::BindOnce(&ClipboardProvider::ConstructImageMatchCallback,
                      callback_weak_ptr_factory_.GetWeakPtr(), input,
                      url_service, clipboard_contents_age));
   return true;
 }
 
-scoped_refptr<base::RefCountedMemory>
-ClipboardURLProvider::EncodeClipboardImage(gfx::Image image) {
+scoped_refptr<base::RefCountedMemory> ClipboardProvider::EncodeClipboardImage(
+    gfx::Image image) {
   gfx::Image resized_image = gfx::ResizedImageForSearchByImage(image);
   return resized_image.As1xPNGBytes();
 }
 
-void ClipboardURLProvider::ConstructImageMatchCallback(
+void ClipboardProvider::ConstructImageMatchCallback(
     const AutocompleteInput& input,
     TemplateURLService* url_service,
     base::TimeDelta clipboard_contents_age,
@@ -291,7 +290,7 @@ void ClipboardURLProvider::ConstructImageMatchCallback(
   done_ = true;
 }
 
-void ClipboardURLProvider::AddProviderInfo(ProvidersInfo* provider_info) const {
+void ClipboardProvider::AddProviderInfo(ProvidersInfo* provider_info) const {
   // If a URL wasn't suggested on this most recent focus event, don't bother
   // setting |times_returned_results_in_session|, as in effect this URL has
   // never been suggested during the current session.  (For the purpose of

components/omnibox/browser/clipboard_url_provider.h → components/omnibox/browser/clipboard_provider.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_OMNIBOX_BROWSER_CLIPBOARD_URL_PROVIDER_H_
-#define COMPONENTS_OMNIBOX_BROWSER_CLIPBOARD_URL_PROVIDER_H_
+#ifndef COMPONENTS_OMNIBOX_BROWSER_CLIPBOARD_PROVIDER_H_
+#define COMPONENTS_OMNIBOX_BROWSER_CLIPBOARD_PROVIDER_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
@@ -15,12 +15,12 @@ class ClipboardRecentContent;
 class HistoryURLProvider;
 
 // Autocomplete provider offering content based on the clipboard's content.
-class ClipboardURLProvider : public AutocompleteProvider {
+class ClipboardProvider : public AutocompleteProvider {
  public:
-  ClipboardURLProvider(AutocompleteProviderClient* client,
-                       AutocompleteProviderListener* listener,
-                       HistoryURLProvider* history_url_provider,
-                       ClipboardRecentContent* clipboard_content);
+  ClipboardProvider(AutocompleteProviderClient* client,
+                    AutocompleteProviderListener* listener,
+                    HistoryURLProvider* history_url_provider,
+                    ClipboardRecentContent* clipboard_content);
 
   // AutocompleteProvider implementation.
   void Start(const AutocompleteInput& input, bool minimal_changes) override;
@@ -28,9 +28,9 @@ class ClipboardURLProvider : public AutocompleteProvider {
   void AddProviderInfo(ProvidersInfo* provider_info) const override;
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(ClipboardURLProviderTest, MatchesImage);
+  FRIEND_TEST_ALL_PREFIXES(ClipboardProviderTest, MatchesImage);
 
-  ~ClipboardURLProvider() override;
+  ~ClipboardProvider() override;
 
   // Handle the match created from one of the match creation methods and do
   // extra tracking and match adding.
@@ -78,9 +78,9 @@ class ClipboardURLProvider : public AutocompleteProvider {
 
   // Used to cancel image construction callbacks if autocomplete Stop() is
   // called.
-  base::WeakPtrFactory<ClipboardURLProvider> callback_weak_ptr_factory_;
+  base::WeakPtrFactory<ClipboardProvider> callback_weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ClipboardURLProvider);
+  DISALLOW_COPY_AND_ASSIGN(ClipboardProvider);
 };
 
-#endif  // COMPONENTS_OMNIBOX_BROWSER_CLIPBOARD_URL_PROVIDER_H_
+#endif  // COMPONENTS_OMNIBOX_BROWSER_CLIPBOARD_PROVIDER_H_

components/omnibox/browser/clipboard_url_provider_unittest.cc → components/omnibox/browser/clipboard_provider_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/omnibox/browser/clipboard_url_provider.h"
+#include "components/omnibox/browser/clipboard_provider.h"
 
 #include <memory>
 #include <string>
@@ -35,19 +35,19 @@ const char kClipboardTitleText[] = "\"Search for me\"";
 
 }  // namespace
 
-class ClipboardURLProviderTest : public testing::Test,
-                                 public AutocompleteProviderListener {
+class ClipboardProviderTest : public testing::Test,
+                              public AutocompleteProviderListener {
  public:
-  ClipboardURLProviderTest()
+  ClipboardProviderTest()
       : client_(new MockAutocompleteProviderClient()),
-        provider_(new ClipboardURLProvider(client_.get(),
-                                           this,
-                                           nullptr,
-                                           &clipboard_content_)) {
+        provider_(new ClipboardProvider(client_.get(),
+                                        this,
+                                        nullptr,
+                                        &clipboard_content_)) {
     SetClipboardUrl(GURL(kClipboardURL));
   }
 
-  ~ClipboardURLProviderTest() override {}
+  ~ClipboardProviderTest() override {}
 
   void ClearClipboard() { clipboard_content_.SuppressClipboardContent(); }
 
@@ -79,37 +79,37 @@ class ClipboardURLProviderTest : public testing::Test,
   TestSchemeClassifier classifier_;
   FakeClipboardRecentContent clipboard_content_;
   std::unique_ptr<MockAutocompleteProviderClient> client_;
-  scoped_refptr<ClipboardURLProvider> provider_;
+  scoped_refptr<ClipboardProvider> provider_;
 };
 
-void ClipboardURLProviderTest::OnProviderUpdate(bool updated_matches) {
+void ClipboardProviderTest::OnProviderUpdate(bool updated_matches) {
   // No action required.
 }
 
-TEST_F(ClipboardURLProviderTest, NotFromOmniboxFocus) {
+TEST_F(ClipboardProviderTest, NotFromOmniboxFocus) {
   provider_->Start(CreateAutocompleteInput(false), false);
   EXPECT_TRUE(provider_->matches().empty());
 }
 
-TEST_F(ClipboardURLProviderTest, EmptyClipboard) {
+TEST_F(ClipboardProviderTest, EmptyClipboard) {
   ClearClipboard();
   provider_->Start(CreateAutocompleteInput(true), false);
   EXPECT_TRUE(provider_->matches().empty());
 }
 
-TEST_F(ClipboardURLProviderTest, ClipboardIsCurrentURL) {
+TEST_F(ClipboardProviderTest, ClipboardIsCurrentURL) {
   SetClipboardUrl(GURL(kCurrentURL));
   provider_->Start(CreateAutocompleteInput(true), false);
   EXPECT_TRUE(provider_->matches().empty());
 }
 
-TEST_F(ClipboardURLProviderTest, HasMultipleMatches) {
+TEST_F(ClipboardProviderTest, HasMultipleMatches) {
   provider_->Start(CreateAutocompleteInput(true), false);
   ASSERT_GE(provider_->matches().size(), 1U);
   EXPECT_EQ(GURL(kClipboardURL), provider_->matches().back().destination_url);
 }
 
-TEST_F(ClipboardURLProviderTest, MatchesText) {
+TEST_F(ClipboardProviderTest, MatchesText) {
   base::test::ScopedFeatureList feature_list;
   base::Feature textFeature = omnibox::kEnableClipboardProviderTextSuggestions;
   feature_list.InitAndEnableFeature(textFeature);
@@ -123,7 +123,7 @@ TEST_F(ClipboardURLProviderTest, MatchesText) {
             provider_->matches().back().contents);
 }
 
-TEST_F(ClipboardURLProviderTest, MatchesImage) {
+TEST_F(ClipboardProviderTest, MatchesImage) {
   base::test::ScopedFeatureList feature_list;
   base::Feature imageFeature =
       omnibox::kEnableClipboardProviderImageSuggestions;

third_party/metrics_proto/README.chromium

 Name: Metrics Protos
 Short Name: metrics_proto
 URL: This is the canonical public repository
-Version: 232558611
-Date: 2019/02/05 UTC
+Version: 233608850
+Date: 2019/02/12 UTC
 License: BSD
 Security Critical: Yes
 

third_party/metrics_proto/omnibox_event.proto

@@ -193,10 +193,10 @@ message OmniboxEventProto {
     // This enum value is currently only used by Android GSA. It represents
     // a suggestion powered by a Chrome content provider.
     ON_DEVICE_CHROME = 13;
-    CLIPBOARD_URL = 14;  // Suggestion coming from clipboard.
-    PHYSICAL_WEB = 15;   // DEPRECATED. Suggestions triggered by URLs broadcast
-                         // by nearby devices.
-    DOCUMENT = 16;       // Suggestions for documents in a cloud corpus.
+    CLIPBOARD = 14;     // Suggestion coming from clipboard.
+    PHYSICAL_WEB = 15;  // DEPRECATED. Suggestions triggered by URLs broadcast
+                        // by nearby devices.
+    DOCUMENT = 16;      // Suggestions for documents in a cloud corpus.
   }
 
   // The result set displayed on the completion popup