Add `chrome.contentSettings.location`.

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

Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
index 9bc60511c73fd068acba09b56ecd9f3e53168843..e7525e591ab1e50543a188afdec5b74a2305ffbf 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
+++ b/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(