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

components/toolbar/toolbar_model_impl.cc

Index: components/toolbar/toolbar_model_impl.cc
diff --git a/components/toolbar/toolbar_model_impl.cc b/components/toolbar/toolbar_model_impl.cc
index e8ae52e50805dc5870aafdb325b745b119ccfb1e..3cc63c0e1fd7a2869afcd24185a73314d3f8535d 100644
--- a/components/toolbar/toolbar_model_impl.cc
+++ b/components/toolbar/toolbar_model_impl.cc
@@ -66,26 +66,6 @@ base::string16 ToolbarModelImpl::GetFormattedURL(size_t* prefix_end) const {
          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);