Consolidate search terms extraction and Instant process determination.

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h"
@@ skipping 124 matching lines @@
 
   // With popup open verify that tab does autocomplete.
   popup_view.set_is_open(true);
   view.OnDoCommandBySelector(@selector(insertTab:));
   EXPECT_EQ(1, model->up_or_down_count());
   view.OnDoCommandBySelector(@selector(insertBacktab:));
   EXPECT_EQ(-1, model->up_or_down_count());
 }
 
 TEST_F(OmniboxViewMacTest, SetInstantSuggestion) {
-  chrome::search::EnableInstantExtendedAPIForTesting();
-
   const NSRect frame = NSMakeRect(0, 0, 50, 30);
   scoped_nsobject<AutocompleteTextField> field(
       [[AutocompleteTextField alloc] initWithFrame:frame]);
 
   TestingToolbarModelDelegate delegate;
   ToolbarModelImpl toolbar_model(&delegate);
   OmniboxViewMac view(NULL, &toolbar_model, profile(), NULL, field.get());
 
   TestingOmniboxEditController controller;
   // This is deleted by the omnibox view.
@@ skipping 37 matching lines @@
 
   // With popup open verify that pressing up and down arrow works.
   popup_view.set_is_open(true);
   model->set_up_or_down_count(0);
   view.OnDoCommandBySelector(@selector(moveDown:));
   EXPECT_EQ(1, model->up_or_down_count());
   model->set_up_or_down_count(0);
   view.OnDoCommandBySelector(@selector(moveUp:));
   EXPECT_EQ(-1, model->up_or_down_count());
 }