Rename various Geolocation bits for clarity and consistency.

content/browser/geolocation/network_location_request.h

Index: content/browser/geolocation/network_location_request.h
diff --git a/content/browser/geolocation/network_location_request.h b/content/browser/geolocation/network_location_request.h
index 6fea08b8bd5d8058c6dfd5c1a2a8efa37699ec62..23bffb92aeedf34522acadb09c839d5f8b8f5f3f 100644
--- a/content/browser/geolocation/network_location_request.h
+++ b/content/browser/geolocation/network_location_request.h
@@ -57,17 +57,17 @@ class NetworkLocationRequest : private net::URLFetcherDelegate {
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   scoped_refptr<net::URLRequestContextGetter> url_context_;
-  LocationResponseCallback callback_;
+  LocationResponseCallback location_response_callback_;
   const GURL url_;
   scoped_ptr<net::URLFetcher> url_fetcher_;
 
   // Keep a copy of the data sent in the request, so we can refer back to it
   // when the response arrives.
   WifiData wifi_data_;
-  base::Time timestamp_;  // Timestamp of the above data, not of the request.
+  base::Time wifi_data_timestamp_;
 
   // The start time for the request.
-  base::TimeTicks start_time_;
+  base::TimeTicks request_start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkLocationRequest);
 };