Revert 180117, it broke all telemetry tests.

Going to commit a fixed version soon.

> Telemetry: add a metadata layer between page set and .wpr.
> 
> The metadata file describes which pages in the page set are
> backed by which .wpr files. This allows us to update individual
> pages in the page set.
> 
> BUG=155660
> NOTRY=true
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/11881051

TBR=marja@chromium.org
Review URL: https://codereview.chromium.org/12088107

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180131 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 7 insertions, 7 deletions

diff --git a/tools/perf/page_sets/2012Q3.json b/tools/perf/page_sets/2012Q3.json
index 226202a..1de1db3 100644
--- a/tools/perf/page_sets/2012Q3.json
+++ b/tools/perf/page_sets/2012Q3.json
@@ -1,6 +1,6 @@
 {
   "description": "Pages hand-picked from top-lists in Q32012.",
-  "archive_data_file": "../data/2012Q3.json",
+  "archive_path": "../data/2012Q3.wpr",
   "credentials_path": "../data/credentials.json",
   "pages": [
     {
diff --git a/tools/perf/page_sets/jsgamebench.json b/tools/perf/page_sets/jsgamebench.json
index f5799b2..e66a736 100644
--- a/tools/perf/page_sets/jsgamebench.json
+++ b/tools/perf/page_sets/jsgamebench.json
@@ -1,6 +1,6 @@
 {
     "description": "Facebook's JSGameBench benchmark",
-    "archive_data_file": "../data/jsgamebench.json",
+    "archive_path": "../data/jsgamebench.wpr",
     "pages": [
         {
             "url": "http://localhost/"
diff --git a/tools/perf/page_sets/key_desktop_sites.json b/tools/perf/page_sets/key_desktop_sites.json
index f25c2ea..f413a7d 100644
--- a/tools/perf/page_sets/key_desktop_sites.json
+++ b/tools/perf/page_sets/key_desktop_sites.json
@@ -1,6 +1,6 @@
 {
     "description": "Sites of Interest",
-    "archive_data_file": "../data/sites_of_interest.json",
+    "archive_path": "../data/sites_of_interest.wpr",
     "credentials_path": "../data/credentials.json",
     "pages": [
         {
diff --git a/tools/perf/page_sets/kraken.json b/tools/perf/page_sets/kraken.json
index 3f5a278..e6c5a6f 100644
--- a/tools/perf/page_sets/kraken.json
+++ b/tools/perf/page_sets/kraken.json
@@ -1,6 +1,6 @@
 {
     "description": "Kraken JavaScript benchmark",
-    "archive_data_file": "../data/kraken.json",
+    "archive_path": "../data/kraken.wpr",
     "pages": [
         {
             "url": "http://krakenbenchmark.mozilla.org/kraken-1.1/driver.html"
diff --git a/tools/perf/page_sets/robohornetpro.json b/tools/perf/page_sets/robohornetpro.json
index 407d22b..a1c9079 100644
--- a/tools/perf/page_sets/robohornetpro.json
+++ b/tools/perf/page_sets/robohornetpro.json
@@ -1,6 +1,6 @@
 {
     "description": "RoboHornet Pro benchmark",
-    "archive_data_file": "../data/robohornetpro.json",
+    "archive_path": "../data/robohornetpro.wpr",
     "pages": [
         {
             "url": "http://ie.microsoft.com/testdrive/performance/robohornetpro/"
diff --git a/tools/perf/page_sets/top_25.json b/tools/perf/page_sets/top_25.json
index ee25674..c1c0c35 100644
--- a/tools/perf/page_sets/top_25.json
+++ b/tools/perf/page_sets/top_25.json
@@ -1,6 +1,6 @@
 {
     "description": "Pages hand-picked for 2012 CrOS scrolling tuning efforts.",
-    "archive_data_file": "../data/top_25.json",
+    "archive_path": "../data/top_25.wpr",
     "credentials_path": "../data/credentials.json",
     "user_agent_type": "desktop",
     "pages": [
diff --git a/tools/perf/page_sets/tough_canvas_cases.json b/tools/perf/page_sets/tough_canvas_cases.json
index fbc1f16..60874e4 100644
--- a/tools/perf/page_sets/tough_canvas_cases.json
+++ b/tools/perf/page_sets/tough_canvas_cases.json
@@ -1,6 +1,6 @@
 {
   "description": "Self-driven Canvas2D animation examples",
-  "archive_data_file": "../data/tough_canvas_cases.json",
+  "archive_path": "../data/tough_canvas_cases.wpr",
   "pages": [
   {
     "url":"http://mudcu.be/labs/JS1k/BreathingGalaxies.html",