Merge 21854 - Disable first run for the New Tab Cold perf test....

chrome/test/startup/feature_startup_test.cc

Index: chrome/test/startup/feature_startup_test.cc
===================================================================
--- chrome/test/startup/feature_startup_test.cc	(revision 22748)
+++ chrome/test/startup/feature_startup_test.cc	(working copy)
@@ -9,6 +9,7 @@
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
@@ -55,6 +56,10 @@
     // Install the location of the test profile file.
     set_template_user_data(ComputeTypicalUserDataSource().ToWStringHack());
 
+    // Disable the first run notification because it has an animation which
+    // masks any real performance regressions.
+    launch_arguments_.AppendSwitch(switches::kDisableNewTabFirstRun);
+
     TimeDelta timings[kNumCycles];
     for (int i = 0; i < kNumCycles; ++i) {
       UITest::SetUp();
Property changes on: chrome\test\startup\feature_startup_test.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/test/startup/feature_startup_test.cc:r69-2775
   Merged /trunk/src/chrome/test/startup/feature_startup_test.cc:r21854