Delete query in omnibox code. R.I.P.

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 48 matching lines @@
   // Truncating the URL breaks editing and then pressing enter, but hopefully
   // people won't try to do much with such enormous URLs anyway. If this becomes
   // a real problem, we could perhaps try to keep some sort of different "elided
   // visible URL" where editing affects and reloads the "real underlying URL",
   // but this seems very tricky for little gain.
   return gfx::TruncateString(formatted_text, max_url_display_chars_ - 1,
                              gfx::CHARACTER_BREAK) +
          gfx::kEllipsisUTF16;
 }
 
-base::string16 ToolbarModelImpl::GetCorpusNameForMobile() const {
-  if (!WouldPerformSearchTermReplacement(false))
-    return base::string16();
-  GURL url(GetURL());
-  // If there is a query in the url fragment look for the corpus name there,
-  // otherwise look for the corpus name in the query parameters.
-  const std::string& query_str(google_util::HasGoogleSearchQueryParam(

[Peter Kasting, 2016/06/17 22:51:33]

I think removing this means we can remove the google_util.h #include.

Please check whether any other #includes are now dead as well.

[Maria, 2016/06/17 23:08:46]

Done.

-      url.ref_piece()) ? url.ref() : url.query());
-  url::Component query(0, static_cast<int>(query_str.length())), key, value;
-  const char kChipKey[] = "sboxchip";
-  while (url::ExtractQueryKeyValue(query_str.c_str(), &query, &key, &value)) {
-    if (key.is_nonempty() && query_str.substr(key.begin, key.len) == kChipKey) {
-      return net::UnescapeAndDecodeUTF8URLComponent(
-          query_str.substr(value.begin, value.len),
-          net::UnescapeRule::NORMAL);
-    }
-  }
-  return base::string16();
-}
-
 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();
 }
 
@@ skipping 67 matching lines @@
 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));
 }