Omnibox - ClipboardRecentContent - Make Proper Singleton

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 <memory>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #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/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"
-#if !defined(OS_IOS)
-#include "components/open_from_clipboard/clipboard_recent_content_generic.h"
-#endif
 #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"
 
+#if !defined(OS_IOS)
+#include "components/open_from_clipboard/clipboard_recent_content_generic.h"
+#endif
+
 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.
 void AutocompleteMatchToAssistedQuery(
     const AutocompleteMatch::Type& match,
     const AutocompleteProvider* provider,
     size_t* type,
     size_t* subtype) {
@@ skipping 181 matching lines @@
   }
   if (provider_types & AutocompleteProvider::TYPE_CLIPBOARD_URL) {
 #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
     // platform), use the generic implementation, which AutocompleteController
     // will own.  Don't try to create a generic implementation on iOS because
     // iOS doesn't want/need to link in the implementation and the libraries
     // that would come with it.
     if (!ClipboardRecentContent::GetInstance()) {
-      clipboard_recent_content_ =
-          base::MakeUnique<ClipboardRecentContentGeneric>();
-      ClipboardRecentContent::SetInstance(clipboard_recent_content_.get());
+      ClipboardRecentContent::SetInstance(
+          std::unique_ptr<ClipboardRecentContentGeneric>());

[Peter Kasting, 2017/04/10 21:59:22]

Doesn't this fail to actually create the underlying object, i.e. the contents of
this unique_ptr are null?  I think you want MakeUnique instead.

[Mark P, 2017/04/10 22:05:22]

Right you are. :-)  Done.  (I didn't bother testing this change, instead waiting
for the try jobs.)

     }
 #endif
     // 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(
           provider_client_.get(), history_url_provider_,
           ClipboardRecentContent::GetInstance()));
     }
   }
@@ skipping 442 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);
   }
 }