Add throughput_test support for file URLs in JSON input file.

chrome/test/perf/rendering/throughput_tests.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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/values.h"
+#include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/perf/browser_perf_test.h"
@@ skipping 38 matching lines @@
   }
 
   // Parse flags from JSON to control the test behavior.
   bool ParseFlagsFromJSON(const FilePath& json_dir,
                           const std::string& json,
                           int index) {
     scoped_ptr<base::Value> root;
     root.reset(base::JSONReader::Read(json, false));
 
     ListValue* root_list = NULL;
-    if (!root.get() || !root->GetAsList(&root_list))
+    if (!root.get() || !root->GetAsList(&root_list)) {
+      LOG(ERROR) << "JSON missing root list element";
       return false;
+    }
 
     DictionaryValue* item = NULL;
-    if (!root_list->GetDictionary(index, &item))
+    if (!root_list->GetDictionary(index, &item)) {
+      LOG(ERROR) << "index " << index << " not found in JSON";
       return false;
+    }
 
     std::string str;
-    if (!item->GetStringASCII("url", &str))
+    if (item->GetStringASCII("url", &str)) {
+      gurl_ = GURL(str);
+    } else if (item->GetStringASCII("file", &str)) {
+      FilePath empty;
+      gurl_ = URLFixerUpper::FixupRelativeFile(empty, empty.AppendASCII(str));
+    } else {
+      LOG(ERROR) << "missing url or file";
       return false;
-    gurl_ = GURL(str);
+    }
+
+    if (!gurl_.is_valid()) {
+      LOG(ERROR) << "invalid url: " << gurl_.possibly_invalid_spec();
+      return false;
+    }
 
     FilePath::StringType cache_dir;
     if (item->GetString("local_path", &cache_dir))
       local_cache_path_ = json_dir.Append(cache_dir);
 
     int num;
     if (item->GetInteger("spinup_time", &num))
       spinup_time_ms_ = num * 1000;
     if (item->GetInteger("run_time", &num))
       run_time_ms_ = num * 1000;
@@ skipping 406 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestSW, CanvasManyImagesSW) {
   RunCanvasBenchTest("many_images", kNone);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, CanvasManyImagesGPU) {
   RunCanvasBenchTest("many_images", kNone);
 }
 
 }  // namespace