InstantExtended: remove old flags, add new flag for query extraction.

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/search/search.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"
 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/platform_test.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
@@ skipping 92 matching lines @@
   void SetModel(OmniboxViewMac* view, OmniboxEditModel* model) {
     view->model_.reset(model);
   }
 };
 
 TEST_F(OmniboxViewMacTest, GetFieldFont) {
   EXPECT_TRUE(OmniboxViewMac::GetFieldFont());
 }
 
 TEST_F(OmniboxViewMacTest, TabToAutocomplete) {
-  chrome::EnableInstantExtendedAPIForTesting();
   OmniboxViewMac view(NULL, profile(), NULL, NULL);
 
   // This is deleted by the omnibox view.
   MockOmniboxEditModel* model =
       new MockOmniboxEditModel(&view, NULL, profile());
   SetModel(&view, model);
 
   MockOmniboxPopupView popup_view;
   OmniboxPopupModel popup_model(&popup_view, model);
 
@@ skipping 63 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());
 }