Permissions: Allow PermissionManager to return more PermissionStatusSources.

chrome/browser/geolocation/geolocation_permission_context_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_
 #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_
 
 // The flow for geolocation permissions on Android needs to take into account
 // the global geolocation settings so it differs from the desktop one. It
 // works as follows.
@@ skipping 44 matching lines @@
     kCount,
   };
 
   static void RegisterProfilePrefs(PrefRegistrySimple* registry);
 
   explicit GeolocationPermissionContextAndroid(Profile* profile);
   ~GeolocationPermissionContextAndroid() override;
 
  protected:
   // GeolocationPermissionContext:
-  ContentSetting GetPermissionStatusInternal(
+  PermissionResult GetPermissionStatusInternal(
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
       const GURL& embedding_origin) const override;
 
  private:
   friend class GeolocationPermissionContextTests;
 
   static void AddDayOffsetForTesting(int days);
   static void SetDSEOriginForTesting(const char* dse_origin);
 
@@ skipping 80 matching lines @@
   infobars::InfoBar* permission_update_infobar_;
 
   // Must be the last member, to ensure that it will be destroyed first, which
   // will invalidate weak pointers.
   base::WeakPtrFactory<GeolocationPermissionContextAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GeolocationPermissionContextAndroid);
 };
 
 #endif  // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_