Flags: Enable Tabbed Options by default.

chrome/browser/dom_ui/options/options_ui_uitest.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 "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 class OptionsUITest : public UITest {
  public:
   OptionsUITest() {
     dom_automation_enabled_ = true;
-    // TODO(csilv): Remove when dom-ui options is enabled by default.
-    launch_arguments_.AppendSwitch(switches::kEnableTabbedOptions);
   }
 
   void AssertIsOptionsPage(TabProxy* tab) {
     std::wstring title;
     ASSERT_TRUE(tab->GetTabTitle(&title));
     string16 expected_title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE);
     ASSERT_EQ(expected_title, WideToUTF16Hack(title));
   }
 };
 
@@ skipping 81 matching lines @@
   ASSERT_TRUE(browser->GetTabCount(&tab_count));
   ASSERT_EQ(1, tab_count);
 
   ASSERT_TRUE(browser->RunCommand(IDC_OPTIONS));
   ASSERT_TRUE(browser->RunCommand(IDC_OPTIONS));
   ASSERT_TRUE(browser->GetTabCount(&tab_count));
   ASSERT_EQ(2, tab_count);
 }
 
 }  // namespace