Permissions: Allow PermissionManager to return more PermissionStatusSources.

chrome/browser/geolocation/geolocation_permission_context_android.cc

 // Copyright 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_android.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 72 matching lines @@
 GeolocationPermissionContextAndroid::GeolocationPermissionContextAndroid(
     Profile* profile)
     : GeolocationPermissionContext(profile),
       location_settings_(new LocationSettingsImpl()),
       permission_update_infobar_(nullptr),
       weak_factory_(this) {}
 
 GeolocationPermissionContextAndroid::~GeolocationPermissionContextAndroid() {
 }
 
-ContentSetting GeolocationPermissionContextAndroid::GetPermissionStatusInternal(
+PermissionResult
+GeolocationPermissionContextAndroid::GetPermissionStatusInternal(
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     const GURL& embedding_origin) const {
-  ContentSetting value =
+  PermissionResult result =
       GeolocationPermissionContext::GetPermissionStatusInternal(
           render_frame_host, requesting_origin, embedding_origin);
 
-  if (value == CONTENT_SETTING_ASK && requesting_origin == embedding_origin) {
+  if (result.content_setting == CONTENT_SETTING_ASK &&
+      requesting_origin == embedding_origin) {
     // Consult the DSE Geolocation setting. Note that this only needs to be
     // consulted when the content setting is ASK. In the other cases (ALLOW or
     // BLOCK) checking the setting is redundant, as the setting is kept
     // consistent with the content setting.
     SearchGeolocationService* search_helper =
         SearchGeolocationService::Factory::GetForBrowserContext(profile());
 
     // If the user is incognito, use the DSE Geolocation setting from the
     // original profile - but only if it is BLOCK.
     if (!search_helper) {
       DCHECK(profile()->IsOffTheRecord());
       search_helper = SearchGeolocationService::Factory::GetForBrowserContext(
           profile()->GetOriginalProfile());
     }
 
     if (search_helper &&
         search_helper->UseDSEGeolocationSetting(
             url::Origin(embedding_origin))) {
       if (!search_helper->GetDSEGeolocationSetting()) {
         // If the DSE setting is off, always return BLOCK.
-        value = CONTENT_SETTING_BLOCK;
+        result.content_setting = CONTENT_SETTING_BLOCK;
       } else if (!profile()->IsOffTheRecord()) {
         // Otherwise, return ALLOW only if this is not incognito.
-        value = CONTENT_SETTING_ALLOW;
+        result.content_setting = CONTENT_SETTING_ALLOW;
       }
     }
   }
 
-  return value;
+  return result;
 }
 
 // static
 void GeolocationPermissionContextAndroid::AddDayOffsetForTesting(int days) {
   g_day_offset_for_testing += days;
 }
 
 // static
 void GeolocationPermissionContextAndroid::SetDSEOriginForTesting(
     const char* dse_origin) {
@@ skipping 361 matching lines @@
     // The tab helper can be null in tests.
     if (disclosure_helper)
       disclosure_helper->MaybeShowDisclosureForAPIAccess(requesting_origin);
   }
 }
 
 void GeolocationPermissionContextAndroid::SetLocationSettingsForTesting(
     std::unique_ptr<LocationSettings> settings) {
   location_settings_ = std::move(settings);
 }