Major revision of page cycler UI.

chrome/browser/extensions/api/record/record_api.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/extensions/api/record/record_api.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 98 matching lines @@
   // Create and fill a temp file to communicate the URL list to the test
   // browser.
   FilePath url_path;
   file_util::CreateTemporaryFile(&url_path);
   file_util::WriteFile(url_path, url_contents_.c_str(), url_contents_.size());
   line.AppendSwitchPath(switches::kVisitURLs, url_path);
 
   // Set up Capture- or Replay-specific commandline switches.
   AddSwitches(&line);
 
-  FilePath error_file_path = url_path.DirName()
-      .Append(url_path.BaseName().value() +
+  FilePath error_file_path = url_path.DirName().
+      Append(url_path.BaseName().value() +
       FilePath::StringType(kURLErrorsSuffix));
 
   LOG(ERROR) << "Test browser commandline: " << line.GetCommandLineString() <<
       " will be repeated " << repeat_count_ << " times....";
 
   // Run the test browser (or a mockup, depending on |process_strategy_|.
   while (repeat_count_-- && errors_.empty() &&
       !file_util::PathExists(error_file_path))
     process_strategy_->RunProcess(line, &errors_);
 
@@ skipping 29 matching lines @@
 CaptureURLsFunction::CaptureURLsFunction(ProcessStrategy* strategy)
     : RunPageCyclerFunction(strategy) {}
 
 // Fetch data for possible optional switch for an extension to load.
 bool CaptureURLsFunction::ParseJSParameters() {
   scoped_ptr<record::CaptureURLs::Params> params(
       record::CaptureURLs::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   url_contents_ = JoinString(params->urls, '\n');
-  user_data_dir_ = FilePath::FromUTF8Unsafe(params->cache_directory_path);
+  // TODO(cstaley): Can't just use captureName -- gotta stick it in a temp dir.
+  // TODO(cstaley): Ensure that capture name is suitable as directory name.
+  user_data_dir_ = FilePath::FromUTF8Unsafe(params->capture_name);
 
   return true;
 }
 
 // CaptureURLsFunction adds "record-mode" to sub-browser call, and returns
 // just the (possibly empty) error list.
 void CaptureURLsFunction::AddSwitches(CommandLine* line) {
   if (!line->HasSwitch(switches::kRecordMode))
     line->AppendSwitch(switches::kRecordMode);
 }
 
 void CaptureURLsFunction::Finish() {
   results_ = record::CaptureURLs::Results::Create(errors_);
   SendResponse(true);
 }
 
-
 // ReplayURLsFunction ------------------------------------------------
 
 ReplayURLsFunction::ReplayURLsFunction()
     : RunPageCyclerFunction(new ProductionProcessStrategy()),
-    run_time_ms_(0) {
+    run_time_ms_(0.0) {
 }
 
 ReplayURLsFunction::ReplayURLsFunction(ProcessStrategy* strategy)
-    : RunPageCyclerFunction(strategy), run_time_ms_(0) {
+    : RunPageCyclerFunction(strategy), run_time_ms_(0.0) {
 }
 
 ReplayURLsFunction::~ReplayURLsFunction() {}
 
 // Fetch data for possible optional switches for a repeat count and an
 // extension to load.
 bool ReplayURLsFunction::ParseJSParameters() {
   scoped_ptr<record::ReplayURLs::Params> params(
       record::ReplayURLs::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  url_contents_ = JoinString(params->urls, '\n');
-  user_data_dir_ = FilePath::FromUTF8Unsafe(params->capture_directory_path);
+
+  // TODO(cstaley): Must build full temp dir from capture_name
+  user_data_dir_ = FilePath::FromUTF8Unsafe(params->capture_name);
+
+  // TODO(cstaley): Get this from user data dir ultimately
+  url_contents_ = "http://www.google.com\nhttp://www.amazon.com";
+
   repeat_count_ = params->repeat_count;
 
   if (params->details.get()) {
     if (params->details->extension_path.get())
       extension_path_ =
           FilePath::FromUTF8Unsafe(*params->details->extension_path);
   }
 
   return true;
 }
@@ skipping 10 matching lines @@
   line->AppendSwitch(switches::kPlaybackMode);
   line->AppendSwitchPath(switches::kRecordStats, stats_file_path_);
 
   timer_ = base::Time::NowFromSystemTime();
 }
 
 // Read stats file, and get run time.
 void ReplayURLsFunction::ReadReplyFiles() {
   file_util::ReadFileToString(stats_file_path_, &stats_);
 
-  run_time_ms_ = (base::Time::NowFromSystemTime() - timer_).InMilliseconds();
+  run_time_ms_ = (base::Time::NowFromSystemTime() - timer_).InMillisecondsF();
 }
 
 void ReplayURLsFunction::Finish() {
   record::ReplayURLsResult result;
 
   result.run_time = run_time_ms_;
   result.stats = stats_;
   result.errors = errors_;
 
   results_ = record::ReplayURLs::Results::Create(result);
   SendResponse(true);
 }
 
 } // namespace extensions