Instant Extended: Add prominent search term support

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac_browsertest.mm

 // Copyright 2013 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #import "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/search_token_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/separator_decoration.h"
@@ skipping 41 matching lines @@
 };
 
 // Verify that the search token decoration is displayed when there are search
 // terms in the omnibox.
 IN_PROC_BROWSER_TEST_F(LocationBarViewMacBrowserTest, SearchToken) {
   GetLocationBar()->Layout();
   EXPECT_FALSE(GetSearchTokenDecoration()->IsVisible());
   EXPECT_FALSE(GetSeparatorDecoration()->IsVisible());
 
   test_toolbar_model_.SetInputInProgress(false);
-  test_toolbar_model_.set_replace_search_url_with_search_terms(true);
+  test_toolbar_model_.set_search_terms_type(ToolbarModel::NORMAL_SEARCH_TERMS);
   GetLocationBar()->Layout();
   EXPECT_TRUE(GetSearchTokenDecoration()->IsVisible());
   EXPECT_TRUE(GetSeparatorDecoration()->IsVisible());
 
   test_toolbar_model_.SetInputInProgress(true);
   GetLocationBar()->Layout();
   EXPECT_FALSE(GetSearchTokenDecoration()->IsVisible());
   EXPECT_FALSE(GetSeparatorDecoration()->IsVisible());
 }