Use ContentSetting in chrome/ instead of PermissionStatus

chrome/browser/geolocation/geolocation_permission_context_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
@@ skipping 894 matching lines @@
   // but not if it is ALLOW.
   SearchGeolocationService* geo_service =
       SearchGeolocationService::Factory::GetForBrowserContext(profile());
   geo_service->SetSearchEngineDelegateForTest(
       base::MakeUnique<TestSearchEngineDelegate>());
 
   Profile* otr_profile = profile()->GetOffTheRecordProfile();
 
   // 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));
 }
 #endif  // defined(OS_ANDROID)