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

chrome/browser/dom_ui/new_tab_ui.cc

Index: chrome/browser/dom_ui/new_tab_ui.cc
===================================================================
--- chrome/browser/dom_ui/new_tab_ui.cc	(revision 22748)
+++ chrome/browser/dom_ui/new_tab_ui.cc	(working copy)
@@ -1498,6 +1498,9 @@
     NewTabHTMLSource::set_first_view(false);
   }
 
+  if (NewTabUI::FirstRunDisabled())
+    NewTabHTMLSource::set_first_run(false);
+
   tab_contents()->render_view_host()->set_paint_observer(new PaintTimer);
 
   if (GetProfile()->IsOffTheRecord()) {
@@ -1599,3 +1602,9 @@
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(switches::kEnableWebResources);
 }
+
+// static
+bool NewTabUI::FirstRunDisabled() {
+  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  return command_line->HasSwitch(switches::kDisableNewTabFirstRun);
+}
Property changes on: chrome\browser\dom_ui\new_tab_ui.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/dom_ui/new_tab_ui.cc:r21854