Add Generic Implementation of ClipboardRecentContent

components/omnibox/browser/autocomplete_controller.cc

 // Copyright (c) 2012 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 "components/omnibox/browser/autocomplete_controller.h"
 
 #include <stddef.h>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 13 matching lines @@
 #include "components/omnibox/browser/clipboard_url_provider.h"
 #include "components/omnibox/browser/history_quick_provider.h"
 #include "components/omnibox/browser/history_url_provider.h"
 #include "components/omnibox/browser/keyword_provider.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/omnibox/browser/physical_web_provider.h"
 #include "components/omnibox/browser/search_provider.h"
 #include "components/omnibox/browser/shortcuts_provider.h"
 #include "components/omnibox/browser/zero_suggest_provider.h"
 #include "components/open_from_clipboard/clipboard_recent_content.h"
+#include "components/open_from_clipboard/clipboard_recent_content_generic.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // Converts the given match to a type (and possibly subtype) based on the AQS
 // specification. For more details, see
 // http://goto.google.com/binary-clients-logging.
@@ skipping 180 matching lines @@
     providers_.push_back(new ShortcutsProvider(provider_client_.get()));
   if (provider_types & AutocompleteProvider::TYPE_ZERO_SUGGEST) {
     zero_suggest_provider_ = ZeroSuggestProvider::Create(
         provider_client_.get(), history_url_provider_, this);
     if (zero_suggest_provider_)
       providers_.push_back(zero_suggest_provider_);
   }
   if (provider_types & AutocompleteProvider::TYPE_CLIPBOARD_URL) {
     ClipboardRecentContent* clipboard_recent_content =
         ClipboardRecentContent::GetInstance();
+    // 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
+    // platform), use the generic implementation, which AutocompleteController
+    // will own.
+    if (!clipboard_recent_content) {
+      clipboard_recent_content_.reset(new ClipboardRecentContentGeneric());

[Peter Kasting, 2017/04/01 05:54:28]

Nit: Prefer =MakeUnique to reset(new

[Mark P, 2017/04/02 05:33:56]

Done.

+      ClipboardRecentContent::SetInstance(clipboard_recent_content_.get());
+      clipboard_recent_content = clipboard_recent_content_.get();
+    }
     if (clipboard_recent_content) {

[Peter Kasting, 2017/04/01 05:54:28]

It seems like this can't fail now and can be removed.

Nit: In which case we could eliminate the temp because it's more trouble than
it's worth:

    if (!ClipboardRecentContent::GetInstance()) {
      ...
    }
    ...use ClipboardRecentContent::GetInstance() directly

[Mark P, 2017/04/02 05:33:56]

Yeah, I agree that it's more trouble than it's worth.  Done.  Thanks for
pointing out the obvious above (that the creation can't fail), which thus makes
it easy to use ClipboardRecentContent::GetInstance() where needed.  (Otherwise
the repeated ClipboardRecentContent::GetInstance() looked like a pain.)

       providers_.push_back(new ClipboardURLProvider(provider_client_.get(),
                                                     history_url_provider_,
                                                     clipboard_recent_content));
     }
   }
   if (provider_types & AutocompleteProvider::TYPE_PHYSICAL_WEB) {
     PhysicalWebProvider* physical_web_provider = PhysicalWebProvider::Create(
         provider_client_.get(), history_url_provider_);
     if (physical_web_provider)
       providers_.push_back(physical_web_provider);
@@ skipping 437 matching lines @@
   expire_timer_.Stop();
   stop_timer_.Stop();
   done_ = true;
   if (clear_result && !result_.empty()) {
     result_.Reset();
     // NOTE: We pass in false since we're trying to only clear the popup, not
     // touch the edit... this is all a mess and should be cleaned up :(
     NotifyChanged(false);
   }
 }