Remove search::GetSearchTerms since it always returns empty string

components/toolbar/toolbar_model_impl.cc

 // Copyright 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/toolbar/toolbar_model_impl.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
@@ skipping 17 matching lines @@
                                    size_t max_url_display_chars)
     : delegate_(delegate), max_url_display_chars_(max_url_display_chars) {
   DCHECK(delegate_);
 }
 
 ToolbarModelImpl::~ToolbarModelImpl() {
 }
 
 // ToolbarModelImpl Implementation.
 base::string16 ToolbarModelImpl::GetText() const {
-  base::string16 search_terms(GetSearchTerms(false));
-  if (!search_terms.empty())
-    return search_terms;

[Peter Kasting, 2016/08/13 05:03:45]

This removal probably means we should rip out GetText() entirely and just
replace calls to it with calls to GetFormattedURL().

[Marc Treib, 2016/08/16 12:00:18]

Done.

-
   return GetFormattedURL(NULL);
 }
 
 base::string16 ToolbarModelImpl::GetFormattedURL(size_t* prefix_end) const {
   GURL url(GetURL());
   // Note that we can't unescape spaces here, because if the user copies this
   // and pastes it into another program, that program may think the URL ends at
   // the space.
   const base::string16 formatted_text =
       delegate_->FormattedStringWithEquivalentMeaning(
@@ skipping 11 matching lines @@
   return gfx::TruncateString(formatted_text, max_url_display_chars_ - 1,
                              gfx::CHARACTER_BREAK) +
          gfx::kEllipsisUTF16;
 }
 
 GURL ToolbarModelImpl::GetURL() const {
   GURL url;
   return delegate_->GetURL(&url) ? url : GURL(url::kAboutBlankURL);
 }
 
-bool ToolbarModelImpl::WouldPerformSearchTermReplacement(
-    bool ignore_editing) const {
-  return !GetSearchTerms(ignore_editing).empty();
-}
-
 SecurityStateModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
     bool ignore_editing) const {
   // When editing or empty, assume no security style.
   return ((input_in_progress() && !ignore_editing) || !ShouldDisplayURL())
              ? SecurityStateModel::NONE
              : delegate_->GetSecurityLevel();
 }
 
 int ToolbarModelImpl::GetIcon() const {
   switch (GetSecurityLevel(false)) {
@@ skipping 50 matching lines @@
   DCHECK(!cert->subject().country_name.empty());
   return l10n_util::GetStringFUTF16(
       IDS_SECURE_CONNECTION_EV,
       base::UTF8ToUTF16(cert->subject().organization_names[0]),
       base::UTF8ToUTF16(cert->subject().country_name));
 }
 
 bool ToolbarModelImpl::ShouldDisplayURL() const {
   return delegate_->ShouldDisplayURL();
 }
-
-base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const {
-  if (!url_replacement_enabled() || (input_in_progress() && !ignore_editing))
-    return base::string16();
-
-  return delegate_->GetSearchTerms(GetSecurityLevel(ignore_editing));
-}