Use ContentSetting in chrome/ instead of PermissionStatus

chrome/browser/geolocation/geolocation_permission_context_unittest.cc

Index: chrome/browser/geolocation/geolocation_permission_context_unittest.cc
diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
index e813b9b5916459d4811971aca3b3ee40263d1e28..47115e3b9fc7e1f82f37b8b073e00b0085b90a7c 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
@@ -912,14 +912,14 @@ TEST_F(GeolocationPermissionContextTests, SearchGeolocationInIncognito) {
 
   // A DSE setting of ALLOW should not flow through to incognito.
   geo_service->SetDSEGeolocationSetting(true);
-  ASSERT_EQ(blink::mojom::PermissionStatus::ASK,
+  ASSERT_EQ(CONTENT_SETTING_ALLOW,

[raymes, 2017/02/28 01:37:34]

This changed to allow? I wonder why tests passed?

[Timothy Loh, 2017/02/28 04:02:46]

Fixed. This test only runs on android (and those bot runs failed due to a
compile error in the tree I think).

             PermissionManager::Get(otr_profile)
                 ->GetPermissionStatus(CONTENT_SETTINGS_TYPE_GEOLOCATION,
                                       requesting_frame, requesting_frame));
 
   // Changing the setting to BLOCK should flow through to incognito.
   geo_service->SetDSEGeolocationSetting(false);
-  ASSERT_EQ(blink::mojom::PermissionStatus::DENIED,
+  ASSERT_EQ(CONTENT_SETTING_BLOCK,
             PermissionManager::Get(otr_profile)
                 ->GetPermissionStatus(CONTENT_SETTINGS_TYPE_GEOLOCATION,
                                       requesting_frame, requesting_frame));