Remove requesting_frame parameters from Geolocation stack

content/browser/geolocation/network_location_provider.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_
 #define CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_
 #pragma once
 
 #include <list>
-#include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "base/threading/thread.h"
 #include "content/browser/geolocation/device_data_provider.h"
 #include "content/browser/geolocation/location_provider.h"
 #include "content/browser/geolocation/network_location_request.h"
@@ skipping 51 matching lines @@
                           net::URLRequestContextGetter* context,
                           const GURL& url,
                           const string16& access_token);
   virtual ~NetworkLocationProvider();
 
   // LocationProviderBase implementation
   virtual bool StartProvider(bool high_accuracy) OVERRIDE;
   virtual void StopProvider() OVERRIDE;
   virtual void GetPosition(Geoposition *position) OVERRIDE;
   virtual void UpdatePosition() OVERRIDE;
-  virtual void OnPermissionGranted(const GURL& requesting_frame) OVERRIDE;
+  virtual void OnPermissionGranted() OVERRIDE;
 
  private:
   // Satisfies a position request from cache or network.
   void RequestPosition();
 
   // Internal helper used by DeviceDataUpdateAvailable
   void OnDeviceDataUpdated();
 
   bool IsStarted() const;
 
@@ skipping 23 matching lines @@
   // The timestamp for the latest device data update.
   base::Time device_data_updated_timestamp_;
 
   // Cached value loaded from the token store or set by a previous server
   // response, and sent in each subsequent network request.
   string16 access_token_;
 
   // The current best position estimate.
   Geoposition position_;
 
+  // Whether permission has been granted for the provider to operate.
+  bool is_permission_granted_;
+
   bool is_new_data_available_;
 
-  std::string most_recent_authorized_host_;
-
   // The network location request object, and the url it uses.
   scoped_ptr<NetworkLocationRequest> request_;
 
   base::WeakPtrFactory<NetworkLocationProvider> weak_factory_;
   // The cache of positions.
   scoped_ptr<PositionCache> position_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkLocationProvider);
 };
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_