Enable query extraction for Android

chrome/browser/ui/toolbar/toolbar_model_unittest.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 "chrome/browser/ui/toolbar/toolbar_model.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 160 matching lines @@
                              should_display);
     NavigateAndCheckTextImpl(url, true, expected_replace_text, would_replace,
                              should_display);
   }
 
   void NavigateAndCheckQueries(const std::vector<const char*>& queries,
                                bool would_replace) {
     const std::string kInstantExtendedPrefix(
         "https://google.com/search?espv=1&q=");
 
-    chrome::search::EnableQueryExtractionForTesting();
+    chrome::search::EnableInstantExtendedAPIForTesting();
 
     ResetDefaultTemplateURL();
     AddTab(browser(), GURL(chrome::kAboutBlankURL));
     for (size_t i = 0; i < queries.size(); ++i) {
       std::string url_string = kInstantExtendedPrefix +
           net::EscapeQueryParamValue(queries[i], true);
       NavigateAndCheckTextImpl(GURL(url_string), true,
                                ASCIIToUTF16(would_replace ?
                                             std::string(queries[i]) :
                                             url_string),
@@ skipping 48 matching lines @@
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text,
                          test_item.expected_replace_text_inactive,
                          false,
                          test_item.should_display);
   }
 }
 
 // Test that we replace URLs when the query extraction API is enabled.
 TEST_F(ToolbarModelTest, ShouldDisplayURLQueryExtractionEnabled) {
-  chrome::search::EnableQueryExtractionForTesting();
+  chrome::search::EnableInstantExtendedAPIForTesting();
 
   ResetDefaultTemplateURL();
   AddTab(browser(), GURL(chrome::kAboutBlankURL));
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text,
                          test_item.expected_replace_text_active,
                          test_item.would_replace,
                          test_item.should_display);
@@ skipping 37 matching lines @@
     "9/11",
     "<nomatch/>",
     "ac/dc",
     "ps/2",
   };
 
   NavigateAndCheckQueries(
       std::vector<const char*>(&kQueries[0],
                                &kQueries[arraysize(kQueries)]), true);
 }