Move dns API to dev channel

BUG=278546 Review URL: https://chromiumcodereview.appspot.com/23867002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221729 0039d316-1c4b-4281-b951-d872f2087c98
280723148 · Sep 6, 2013 · aa27da1 · aa27da1
1 parent 3dfd4ac
commit aa27da1
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 21 deletions.
diff --git a/chrome/browser/extensions/api/dns/dns_api.cc b/chrome/browser/extensions/api/dns/dns_api.cc
@@ -9,16 +9,16 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h"
 #include "chrome/browser/io_thread.h"
-#include "chrome/common/extensions/api/experimental_dns.h"
+#include "chrome/common/extensions/api/dns.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 
 using content::BrowserThread;
-using extensions::api::experimental_dns::ResolveCallbackResolveInfo;
+using extensions::api::dns::ResolveCallbackResolveInfo;
 
-namespace Resolve = extensions::api::experimental_dns::Resolve;
+namespace Resolve = extensions::api::dns::Resolve;
 
 namespace extensions {
 

diff --git a/chrome/browser/extensions/api/dns/dns_api.h b/chrome/browser/extensions/api/dns/dns_api.h
@@ -19,8 +19,7 @@ namespace extensions {
 
 class DnsResolveFunction : public AsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("experimental.dns.resolve",
-                             EXPERIMENTAL_DNS_RESOLVE)
+  DECLARE_EXTENSION_FUNCTION("dns.resolve", DNS_RESOLVE)
 
   DnsResolveFunction();
 

diff --git a/chrome/browser/extensions/extension_function_histogram_value.h b/chrome/browser/extensions/extension_function_histogram_value.h
@@ -152,7 +152,7 @@ enum HistogramValue {
   METRICSPRIVATE_RECORDSMALLCOUNT,
   APP_CURRENTWINDOWINTERNAL_MINIMIZE,
   DEVELOPERPRIVATE_AUTOUPDATE,
-  EXPERIMENTAL_DNS_RESOLVE,
+  DNS_RESOLVE,
   DELETED_EXPERIMENTAL_SYSTEMINFO_MEMORY_GET,
   HISTORY_ADDURL,
   TABS_GET,

diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json
@@ -162,6 +162,10 @@
     "dependencies": ["permission:dial"],
     "contexts": ["blessed_extension"]
   },
+  "dns": {
+    "dependencies": ["permission:dns"],
+    "contexts": ["blessed_extension"]
+  },
   "downloads": {
     "dependencies": ["permission:downloads"],
     "contexts": ["blessed_extension"]
@@ -197,10 +201,6 @@
     "dependencies": ["permission:experimental"],
     "contexts": ["blessed_extension"]
   },
-  "experimental.dns": {
-    "dependencies": ["permission:experimental"],
-    "contexts": ["blessed_extension"]
-  },
   "experimental.history": {
     "dependencies": ["permission:history", "permission:experimental"],
     "contexts": ["blessed_extension"]

diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
@@ -203,6 +203,10 @@
       "whitelist": ["80B9DC58E5210749F052F5B4DB239C50CF72AEB6"]
     }
   ],
+  "dns": {
+    "channel": "dev",
+    "extension_types": ["extension", "platform_app"]
+  },
   "downloads": {
     "channel": "beta",
     "extension_types": ["extension"]

diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
@@ -43,14 +43,14 @@
           'desktop_capture.idl',
           'diagnostics.idl',
           'dial.idl',
+          'dns.idl',
           'downloads.idl',
           'echo_private.json',
           'downloads_internal.idl',
           'enterprise_platform_keys_private.json',
           'events.json',
           'experimental_accessibility.json',
           'experimental_discovery.idl',
-          'experimental_dns.idl',
           'experimental_history.json',
           'experimental_identity.idl',
           'experimental_idltest.idl',

diff --git a/...ommon/extensions/api/experimental_dns.idl → chrome/common/extensions/api/dns.idl b/...ommon/extensions/api/experimental_dns.idl → chrome/common/extensions/api/dns.idl
@@ -1,9 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-// Experimental.dns.
-namespace experimental.dns {
+namespace dns {
 
   dictionary ResolveCallbackResolveInfo {
     // The result code. Zero indicates success.

diff --git a/chrome/common/extensions/api/extension_api_unittest.cc b/chrome/common/extensions/api/extension_api_unittest.cc
@@ -334,8 +334,8 @@ TEST(ExtensionAPITest, LazyGetSchema) {
   EXPECT_EQ(NULL, apis->GetSchema("foo"));
   EXPECT_EQ(NULL, apis->GetSchema("foo"));
 
-  EXPECT_TRUE(apis->GetSchema("experimental.dns"));
-  EXPECT_TRUE(apis->GetSchema("experimental.dns"));
+  EXPECT_TRUE(apis->GetSchema("dns"));
+  EXPECT_TRUE(apis->GetSchema("dns"));
   EXPECT_TRUE(apis->GetSchema("extension"));
   EXPECT_TRUE(apis->GetSchema("extension"));
   EXPECT_TRUE(apis->GetSchema("infobars"));

diff --git a/chrome/common/extensions/permissions/api_permission.h b/chrome/common/extensions/permissions/api_permission.h
@@ -68,6 +68,7 @@ class APIPermission {
     kDesktopCapture,
     kDeveloperPrivate,
     kDevtools,
+    kDns,
     kDownloads,
     kDownloadsInternal,
     kDownloadsOpen,

diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc
@@ -54,6 +54,7 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions()
       APIPermissionInfo::kFlagNone,
       IDS_EXTENSION_PROMPT_WARNING_DESKTOP_CAPTURE,
       PermissionMessage::kDesktopCapture },
+    { APIPermission::kDns, "dns" },
     { APIPermission::kDownloads, "downloads", APIPermissionInfo::kFlagNone,
       IDS_EXTENSION_PROMPT_WARNING_DOWNLOADS,
       PermissionMessage::kDownloads },

diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -643,6 +643,7 @@ TEST(PermissionsTest, PermissionMessages) {
   skip.insert(APIPermission::kBrowsingData);
   skip.insert(APIPermission::kContextMenus);
   skip.insert(APIPermission::kDiagnostics);
+  skip.insert(APIPermission::kDns);
   skip.insert(APIPermission::kDownloadsShelf);
   skip.insert(APIPermission::kFontSettings);
   skip.insert(APIPermission::kFullscreen);

diff --git a/chrome/test/data/extensions/api_test/dns/api/background.js b/chrome/test/data/extensions/api_test/dns/api/background.js
@@ -8,7 +8,7 @@ var testIPLiteralResolution = function() {
     chrome.test.assertEq("127.0.0.1", resolveInfo.address);
     chrome.test.succeed("IP literal resolved");
   };
-  chrome.experimental.dns.resolve("127.0.0.1", callback);
+  chrome.dns.resolve("127.0.0.1", callback);
 };
 
 var testHostnameResolution = function() {
@@ -17,7 +17,7 @@ var testHostnameResolution = function() {
     chrome.test.assertEq("9.8.7.6", resolveInfo.address);
     chrome.test.succeed("hostname resolved");
   };
-  chrome.experimental.dns.resolve("www.sowbug.com", callback);
+  chrome.dns.resolve("www.sowbug.com", callback);
 };
 
 var testNonexistentHostnameResolution = function() {
@@ -26,7 +26,7 @@ var testNonexistentHostnameResolution = function() {
     chrome.test.assertEq(-105, resolveInfo.resultCode);
     chrome.test.succeed("hostname correctly failed to resolve");
   };
-  chrome.experimental.dns.resolve("this.hostname.is.bogus", callback);
+  chrome.dns.resolve("this.hostname.is.bogus", callback);
 };
 
 chrome.test.runTests([testIPLiteralResolution,

diff --git a/chrome/test/data/extensions/api_test/dns/api/manifest.json b/chrome/test/data/extensions/api_test/dns/api/manifest.json
@@ -8,6 +8,6 @@
     }
   },
   "permissions": [
-    "experimental"
+    "dns"
   ]
 }
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
@@ -19861,7 +19861,7 @@ other types of suffix sets.
   <int value="90" label="METRICSPRIVATE_RECORDSMALLCOUNT"/>
   <int value="91" label="APP_CURRENTWINDOWINTERNAL_MINIMIZE"/>
   <int value="92" label="DEVELOPERPRIVATE_AUTOUPDATE"/>
-  <int value="93" label="EXPERIMENTAL_DNS_RESOLVE"/>
+  <int value="93" label="DNS_RESOLVE"/>
   <int value="94" label="EXPERIMENTAL_SYSTEMINFO_MEMORY_GET"/>
   <int value="95" label="HISTORY_ADDURL"/>
   <int value="96" label="TABS_GET"/>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,6 @@ @@
         }
       },
       "permissions": [
-        "experimental"
+        "dns"
       ]
     }