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

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_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 <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
@@ skipping 1534 matching lines @@
        ++i) {
     NSRect frame = [[bar_ view] frame];
     frame.size.width = viewWidths[i] + bookmarks::kBookmarkRightMargin;
     [[bar_ view] setFrame:frame];
     EXPECT_EQ(offTheSideButtonIsHiddenResults[i],
               [bar_ offTheSideButtonIsHidden]);
     EXPECT_EQ(displayedButtonCountResults[i], [bar_ displayedButtonCount]);
   }
 }
 
-class BookmarkBarControllerWithInstantExtendedTest :
-    public BookmarkBarControllerTest {
- public:
-  virtual void AddCommandLineSwitches() OVERRIDE {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kEnableInstantExtendedAPI);
-  }
-};
-
-TEST_F(BookmarkBarControllerWithInstantExtendedTest,
-    BookmarksWithAppsPageShortcut) {
+TEST_F(BookmarkBarControllerTest, BookmarksWithAppsPageShortcut) {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* root = model->bookmark_bar_node();
   const std::string model_string("1b 2f:[ 2f1b 2f2b ] 3b ");
   test::AddNodesFromModelString(model, root, model_string);
   [bar_ frameDidChange];
 
   // Apps page shortcut button should be visible.
   ASSERT_FALSE([bar_ appsPageShortcutButtonIsHidden]);
 
   // Bookmarks should be to the right of the Apps page shortcut button.
   CGFloat apps_button_right = NSMaxX([[bar_ appsPageShortcutButton] frame]);
   CGFloat right = apps_button_right;
   NSArray* buttons = [bar_ buttons];
   for (size_t i = 0; i < [buttons count]; ++i) {
     EXPECT_LE(right, NSMinX([[buttons objectAtIndex:i] frame]));
     right = NSMaxX([[buttons objectAtIndex:i] frame]);
   }
 
   // Removing the Apps button should move every bookmark to the left.
   profile()->GetPrefs()->SetBoolean(prefs::kShowAppsShortcutInBookmarkBar,
                                     false);
   ASSERT_TRUE([bar_ appsPageShortcutButtonIsHidden]);
   EXPECT_GT(apps_button_right, NSMinX([[buttons objectAtIndex:0] frame]));
   for (size_t i = 1; i < [buttons count]; ++i) {
     EXPECT_LE(NSMaxX([[buttons objectAtIndex:i - 1] frame]),
               NSMinX([[buttons objectAtIndex:i] frame]));
   }
 }
 
-TEST_F(BookmarkBarControllerWithInstantExtendedTest,
-    BookmarksWithoutAppsPageShortcut) {
+TEST_F(BookmarkBarControllerTest, BookmarksWithoutAppsPageShortcut) {
   // The no item containers should be to the right of the Apps button.
   ASSERT_FALSE([bar_ appsPageShortcutButtonIsHidden]);
   CGFloat apps_button_right = NSMaxX([[bar_ appsPageShortcutButton] frame]);
   EXPECT_LE(apps_button_right,
             NSMinX([[[bar_ buttonView] noItemTextfield] frame]));
   EXPECT_LE(NSMaxX([[[bar_ buttonView] noItemTextfield] frame]),
             NSMinX([[[bar_ buttonView] importBookmarksButton] frame]));
 
   // Removing the Apps button should move the no item containers to the left.
   profile()->GetPrefs()->SetBoolean(prefs::kShowAppsShortcutInBookmarkBar,
@@ skipping 472 matching lines @@
                              "2f3b ] 4b ");
   actual = test::ModelStringFromNode(root);
   EXPECT_EQ(expected, actual);
 
   // Verify that the other bookmark folder can't be deleted.
   BookmarkButton *otherButton = [bar_ otherBookmarksButton];
   EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
 }
 
 }  // namespace