Reland r140188: CommandLine Page Cycler

chrome/browser/ui/startup/startup_browser_creator_impl.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/startup/startup_browser_creator_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 333 matching lines @@
   // unless otherwise specified.
   if (!command_line_.HasSwitch(switches::kNoEvents)) {
     FilePath script_path;
     PathService::Get(chrome::FILE_RECORDED_SCRIPT, &script_path);
 
     bool record_mode = command_line_.HasSwitch(switches::kRecordMode);
     bool playback_mode = command_line_.HasSwitch(switches::kPlaybackMode);
 
     if (record_mode && chrome::kRecordModeEnabled)
       base::EventRecorder::current()->StartRecording(script_path);
-    if (playback_mode)
+    // Do not enter Playback mode if PageCycler is running; Playback mode does
+    // not work correctly.
+    if (playback_mode && !command_line_.HasSwitch(switches::kVisitURLs))
       base::EventRecorder::current()->StartPlayback(script_path);
   }
 
 #if defined(OS_WIN)
   if (process_startup)
     ShellIntegration::MigrateChromiumShortcuts();
 #endif  // defined(OS_WIN)
 
   return true;
 }
@@ skipping 489 matching lines @@
         // New:
         prefs->GetString(prefs::kHomePage),
         prefs->GetBoolean(prefs::kHomePageIsNewTabPage),
         prefs->GetBoolean(prefs::kShowHomeButton),
         // Backup:
         backup_homepage,
         backup_homepage_is_ntp,
         backup_show_home_button));
   }
 }