Add `chrome.contentSettings.location`.

Most everything was already in place for this, we just needed to wire
it up to the external API.

BUG=447989
R=bauerb@chromium.org,kalman@chromium.org

Review URL: https://codereview.chromium.org/843413003

Cr-Commit-Position: refs/heads/master@{#311462}

chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

@@ -96,15 +96,11 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
                                      example_url,
                                      CONTENT_SETTINGS_TYPE_POPUPS,
                                      std::string()));
-#if 0
-    // TODO(bauerb): Enable once geolocation settings are integrated into the
-    // HostContentSettingsMap.
-    EXPECT_EQ(CONTENT_SETTING_ALLOW,
+    EXPECT_EQ(CONTENT_SETTING_ASK,
               map->GetContentSetting(example_url,
                                      example_url,
                                      CONTENT_SETTINGS_TYPE_GEOLOCATION,
                                      std::string()));
-#endif
     EXPECT_EQ(CONTENT_SETTING_ASK,
               map->GetContentSetting(example_url,
                                      example_url,
@@ -126,11 +122,9 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
-#if 0
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string()));
-#endif
     EXPECT_EQ(
         CONTENT_SETTING_BLOCK,
         map->GetContentSetting(
@@ -160,13 +154,9 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
-#if 0
-    // TODO(bauerb): Enable once geolocation settings are integrated into the
-    // HostContentSettingsMap.
-    EXPECT_EQ(CONTENT_SETTING_ALLOW,
+    EXPECT_EQ(CONTENT_SETTING_ASK,
               map->GetContentSetting(
                   url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string()));
-#endif
     EXPECT_EQ(
         CONTENT_SETTING_ASK,
         map->GetContentSetting(

chrome/common/extensions/api/content_settings.json

@@ -197,6 +197,14 @@
           {"type":"string", "enum": ["allow", "block"]}
         ]
       },
+      "location": {
+        "$ref": "ContentSetting",
+        "description": "Whether to allow Geolocation. One of <br><var>allow</var>: Allow sites to track your physical location,<br><var>block</var>: Don't allow sites to track your physical location,<br><var>ask</var>: Ask before allowing sites to track your physical location. <br>Default is <var>ask</var>.<br>The primary URL is the URL of the document which requested location data. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL).",
+        "value": [
+          "location",
+          {"type":"string", "enum": ["allow", "block", "ask"]}
+        ]
+      },
       "plugins": {
         "$ref": "ContentSetting",
         "description": "Whether to run plug-ins. One of<br><var>allow</var>: Run plug-ins automatically,<br><var>block</var>: Don't run plug-ins automatically. <br>Default is <var>allow</var>.<br>The primary URL is the main-frame URL. The secondary URL is not used.",

chrome/test/data/extensions/api_test/content_settings/standard/test.js

@@ -12,8 +12,7 @@ var default_content_settings = {
   "javascript": "block",
   "plugins": "allow",
   "popups": "block",
-  // TODO(bauerb)
-  // "geolocation": "ask",
+  "location": "ask",
   "notifications": "ask"
 };
 
@@ -23,7 +22,7 @@ var settings = {
   "javascript": "block",
   "plugins": "block",
   "popups": "allow",
-  // "geolocation": "block",
+  "location": "block",
   "notifications": "block"
 };