Add tab switch test launch arguments directly.

BUG=none
TEST=tab switching test runs without needing additional
arguments

Review URL: http://codereview.chromium.org/502091

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35083 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 3 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index b46f985..9c3cb9f 100755
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1320,8 +1320,7 @@
       'type': 'executable',
       'msvs_guid': 'A34770EA-A574-43E8-9327-F79C04770E98',
       'run_as': {
-        'action': ['$(TargetPath)', '--gtest_print_time', '-enable-logging',
-                   '-dump-histograms-on-exit', '-log-level=0'],
+        'action': ['$(TargetPath)', '--gtest_print_time'],
       },
       'dependencies': [
         'chrome',
diff --git a/chrome/test/tab_switching/tab_switching_test.cc b/chrome/test/tab_switching/tab_switching_test.cc
index a367414..3c6c312 100644
--- a/chrome/test/tab_switching/tab_switching_test.cc
+++ b/chrome/test/tab_switching/tab_switching_test.cc
@@ -27,7 +27,6 @@ namespace {
 // time taken for each switch. It then prints out the times on the console,
 // with the aim that the page cycler parser can interpret these numbers to
 // draw graphs for page cycler Tab Switching Performance.
-// Usage Flags: --enable-logging --dump-histograms-on-exit --log-level=0
 class TabSwitchingUITest : public UITest {
  public:
   TabSwitchingUITest() {
@@ -51,6 +50,9 @@ class TabSwitchingUITest : public UITest {
            log_file_name_.value().c_str(), 1);
 #endif
 
+    // Add the necessary arguments to Chrome's launch command for these tests.
+    AddLaunchArguments();
+
     // Run the rest of the UITest initialization.
     UITest::SetUp();
   }
@@ -165,6 +167,12 @@ class TabSwitchingUITest : public UITest {
   scoped_refptr<BrowserProxy> browser_proxy_;
 
  private:
+  void AddLaunchArguments() {
+    launch_arguments_.AppendSwitch(switches::kEnableLogging);
+    launch_arguments_.AppendSwitch(switches::kDumpHistogramsOnExit);
+    launch_arguments_.AppendSwitchWithValue(switches::kLoggingLevel, "0");
+  }
+
   DISALLOW_COPY_AND_ASSIGN(TabSwitchingUITest);
 };