Flags: Enable Tabbed Options by default.

chrome/browser/ui/browser_navigator_browsertest.cc

 // Copyright (c) 2010 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/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 45 matching lines @@
     browser::NavigateParams p(MakeNavigateParams());
     p.disposition = disposition;
     browser::Navigate(&p);
 
     // Nothing should have happened as a result of Navigate();
     EXPECT_EQ(1, browser()->tab_count());
     EXPECT_EQ(1u, BrowserList::size());
     EXPECT_EQ(old_url, browser()->GetSelectedTabContents()->GetURL());
   }
 
-  // TODO(jhawkins): Remove once tabbed options are enabled by default.
-  virtual void SetUpCommandLine(CommandLine* command_line) {
-    command_line->AppendSwitch(switches::kEnableTabbedOptions);
-  }
-
   void Observe(NotificationType type, const NotificationSource& source,
                const NotificationDetails& details) {
     switch (type.value) {
       case NotificationType::RENDER_VIEW_HOST_CREATED_FOR_TAB: {
         ++this->created_tab_contents_count_;
         break;
       }
       default:
         break;
     }
@@ skipping 421 matching lines @@
   EXPECT_EQ(Browser::TYPE_NORMAL, p.browser->type());
 
   // We should now have two windows, the browser() provided by the framework and
   // the new normal window.
   EXPECT_EQ(2u, BrowserList::size());
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1, p.browser->tab_count());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
-// and |ignore_paths| = true opens a new tab navigated to the specified URL if no
-// previous tab with that URL (minus the path) exists.
+// and |ignore_paths| = true opens a new tab navigated to the specified URL if
+// no previous tab with that URL (minus the path) exists.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabNew_IgnorePath) {
   GURL url("http://www.google.com/");
   browser()->AddSelectedTabWithURL(url, PageTransition::LINK);
 
   // We should have one browser with 2 tabs, the 2nd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->selected_index());
 
@@ skipping 72 matching lines @@
   // The middle tab should now be selected and navigated to the sub-page of the
   // URL.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(1, browser()->selected_index());
   EXPECT_EQ(GURL("chrome://settings/personal"),
             browser()->GetSelectedTabContents()->GetURL());
 }
 
 }  // namespace