Instant Extended: Add prominent search term support

chrome/browser/ui/omnibox/omnibox_edit_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 "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
@@ skipping 170 matching lines @@
   // TemplateURLService at construction time.
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       &profile, &TemplateURLServiceFactory::BuildInstanceFor);
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
       &profile, &AutocompleteClassifierFactory::BuildInstanceFor);
   OmniboxEditModel model(&view, &controller, &profile);
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(input); ++i) {
     model.UpdatePermanentText(ASCIIToUTF16(input[i].perm_text));
 
-    toolbar_model()->set_replace_search_url_with_search_terms(
-        input[i].extracted_search_terms);
+    if (input[i].extracted_search_terms)

[Peter Kasting, 2013/04/25 19:42:54]

Nit: Simpler:

    toolbar_model()->set_search_term_type(input[i].extracted_search_terms ?
        ToolbarModel::SEARCH_TERM_NORMAL : ToolbarModel::SEARCH_TERM_NONE);

[sail, 2013/04/25 22:18:46]

Done.

+      toolbar_model()->set_search_term_type(ToolbarModel::SEARCH_TERM_NORMAL);
+    else
+      toolbar_model()->set_search_term_type(ToolbarModel::SEARCH_TERM_NONE);
 
     string16 result = ASCIIToUTF16(input[i].input);
     GURL url;
     bool write_url;
     model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected,
                             &result, &url, &write_url);
     EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i;
     EXPECT_EQ(input[i].write_url, write_url) << " @" << i;
     if (write_url)
       EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i;
   }
 }