Cleanup: Remove for_search param from search::InstantExtendedEnabledParam()

components/search_engines/template_url.cc

 // Copyright 2014 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/search_engines/template_url.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 950 matching lines @@
 
       case GOOGLE_INPUT_TYPE:
         DCHECK(!i->is_post_param);
         HandleReplacement(
             "oit", base::IntToString(search_terms_args.input_type), *i, &url);
         break;
 
       case GOOGLE_INSTANT_EXTENDED_ENABLED:
         DCHECK(!i->is_post_param);
         HandleReplacement(std::string(),
-                          search_terms_data.InstantExtendedEnabledParam(
-                              type_ == SEARCH),
-                          *i,
-                          &url);
+                          type_ == SEARCH

[Peter Kasting, 2016/11/22 22:00:44]

Nit: Add comment about why we want this to be the empty string when type_ ==
SEARCH

[Marc Treib, 2016/11/23 10:29:19]

Done.

+                              ? std::string()
+                              : search_terms_data.InstantExtendedEnabledParam(),
+                          *i, &url);
         break;
 
       case GOOGLE_CONTEXTUAL_SEARCH_VERSION:
         if (search_terms_args.contextual_search_params.version >= 0) {
           HandleReplacement(
               "ctxs",
               base::IntToString(
                   search_terms_args.contextual_search_params.version),
               *i,
               &url);
@@ skipping 539 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }