Moving experimental.metrics API to metricsPrivate

chrome/test/data/extensions/api_test/metrics/test.js

Index: chrome/test/data/extensions/api_test/metrics/test.js
diff --git a/chrome/test/data/extensions/api_test/metrics/test.js b/chrome/test/data/extensions/api_test/metrics/test.js
index 787d49f6f09ba2da1109ce7ad903f34adefc331b..8241c1b646c613afba172dcc1f47551912760773 100644
--- a/chrome/test/data/extensions/api_test/metrics/test.js
+++ b/chrome/test/data/extensions/api_test/metrics/test.js
@@ -9,40 +9,19 @@
 // with the checks done in IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Metrics).
 // See extension_metrics_apitest.cc.
 chrome.test.runTests([
-  function getSetEnabled() {
-    var pass = chrome.test.callbackPass;
-    var metrics = chrome.experimental.metrics;
-    // Try to change the setting and put it back. We use callbacks to ensure
-    // all functions are called in order.
-    metrics.getEnabled(pass(function(old_enabled) {
-      // Verify that it is, indeed, a boolean.
-      chrome.test.assertEq(old_enabled, !!old_enabled);
-      metrics.setEnabled(!old_enabled, pass(function(new_enabled) {
-        chrome.test.assertEq(old_enabled, !new_enabled);
-        metrics.getEnabled(pass(function(n) {
-          chrome.test.assertEq(n, new_enabled);
-
-          metrics.setEnabled(old_enabled, pass(function(o) {
-            chrome.test.assertEq(o, old_enabled);
-          }));
-        }));
-      }));
-    }));
-  },
-
   function recordUserAction() {
     // Log a metric once.
-    chrome.experimental.metrics.recordUserAction('test.ua.1');
+    chrome.metricsPrivate.recordUserAction('test.ua.1');
 
     // Log a metric more than once.
-    chrome.experimental.metrics.recordUserAction('test.ua.2');
-    chrome.experimental.metrics.recordUserAction('test.ua.2');
+    chrome.metricsPrivate.recordUserAction('test.ua.2');
+    chrome.metricsPrivate.recordUserAction('test.ua.2');
 
     chrome.test.succeed();
   },
 
   function recordValue() {
-    chrome.experimental.metrics.recordValue({
+    chrome.metricsPrivate.recordValue({
       'metricName': 'test.h.1',
       'type': 'histogram-log',
       'min': 1,
@@ -50,7 +29,7 @@ chrome.test.runTests([
       'buckets': 50
     }, 42);
 
-    chrome.experimental.metrics.recordValue({
+    chrome.metricsPrivate.recordValue({
       'metricName': 'test.h.2',
       'type': 'histogram-linear',
       'min': 1,
@@ -58,25 +37,24 @@ chrome.test.runTests([
       'buckets': 50
     }, 42);
 
-    chrome.experimental.metrics.recordPercentage('test.h.3', 42);
-    chrome.experimental.metrics.recordPercentage('test.h.3', 42);
+    chrome.metricsPrivate.recordPercentage('test.h.3', 42);
+    chrome.metricsPrivate.recordPercentage('test.h.3', 42);
 
     chrome.test.succeed();
   },
 
   function recordTimes() {
-    chrome.experimental.metrics.recordTime('test.time', 42);
-    chrome.experimental.metrics.recordMediumTime('test.medium.time', 42 * 1000);
-    chrome.experimental.metrics.recordLongTime('test.long.time',
-                                               42 * 1000 * 60);
+    chrome.metricsPrivate.recordTime('test.time', 42);
+    chrome.metricsPrivate.recordMediumTime('test.medium.time', 42 * 1000);
+    chrome.metricsPrivate.recordLongTime('test.long.time', 42 * 1000 * 60);
 
     chrome.test.succeed();
   },
 
   function recordCounts() {
-    chrome.experimental.metrics.recordCount('test.count', 420000);
-    chrome.experimental.metrics.recordMediumCount('test.medium.count', 4200);
-    chrome.experimental.metrics.recordSmallCount('test.small.count', 42);
+    chrome.metricsPrivate.recordCount('test.count', 420000);
+    chrome.metricsPrivate.recordMediumCount('test.medium.count', 4200);
+    chrome.metricsPrivate.recordSmallCount('test.small.count', 42);
 
     chrome.test.succeed();
   }