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 35 matching lines @@
 RunPageCyclerFunction::~RunPageCyclerFunction() {}
 
 bool RunPageCyclerFunction::RunImpl() {
   if (!ParseJSParameters())
      return false;
 
   // If we've had any errors reportable to the JS caller so far (in
   // parameter parsing) then return a list of such errors, else perform
   // RunTestBrowser on the BlockingPool.
   if (!errors_.empty()) {
-    results_ = record::CaptureURLs::Results::Create(errors_);
+    results_ = record::CaptureURLs::Results::Create(errors_, "FIX_ME");
     SendResponse(true);
   } else {
     content::BrowserThread::PostBlockingPoolTask(FROM_HERE,
         base::Bind(&RunPageCyclerFunction::RunTestBrowser, this));
     process_strategy_->PumpBlockingPool();  // Test purposes only.
   }
 
   return true;
 }
 
@@ skipping 93 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);
+  // FIX: Can't just use captureName -- gotta stick it in a temp dir

[Jeffrey Yasskin, 2012/08/09 19:27:04]

I believe it's more common to use TODO(yourname) instead of "FIX" for changes
you intend to make in a subsequent change. If you're using "FIX" to mark fixes
you intend to make in _this_ change, then "hey, you forgot to make them." ;)

[clintstaley, 2012/08/10 00:33:13]

Done.

+  user_data_dir_ = FilePath::FromUTF8Unsafe(params->capture_name);

[Jeffrey Yasskin, 2012/08/09 19:27:04]

What happens if the user's filesystem doesn't use UTF-8? Do extensions need to
be aware that their capture_name will be used as a directory name?

[clintstaley, 2012/08/10 00:33:13]

Good point.  I think we probably just need to be sure the capture names follow
alphanumeric+_ rules.  Will note for later revision.  TODO(cstaley)  not "FIX"
:) added.

 
   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_);
+  results_ = record::CaptureURLs::Results::Create(errors_,
+      user_data_dir_.AsUTF8Unsafe());
   SendResponse(true);
 }
 
-
 // ReplayURLsFunction ------------------------------------------------
 
 ReplayURLsFunction::ReplayURLsFunction()
     : RunPageCyclerFunction(new ProductionProcessStrategy()),
     run_time_ms_(0) {
 }
 
 ReplayURLsFunction::ReplayURLsFunction(ProcessStrategy* strategy)
     : RunPageCyclerFunction(strategy), run_time_ms_(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);
+
+  // FIX: Must build full temp dir from capture_name
+  user_data_dir_ = FilePath::FromUTF8Unsafe(params->capture_name);
+
+  // FIX: Get this from user data dir ultimately
+  url_contents_ = "http://www.google.com\nhttp://www.amazon.com\n";
+
   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 14 matching lines @@
 }
 
 // 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();
 }
 
 void ReplayURLsFunction::Finish() {
-  record::ReplayURLsResult result;
-
-  result.run_time = run_time_ms_;
-  result.stats = stats_;
-  result.errors = errors_;
-
-  results_ = record::ReplayURLs::Results::Create(result);
+  results_ = record::ReplayURLs::Results::Create(run_time_ms_, stats_, errors_);
   SendResponse(true);
 }
 
 } // namespace extensions