Index: chrome/browser/safe_browsing/protocol_manager.h |
=================================================================== |
--- chrome/browser/safe_browsing/protocol_manager.h (revision 107061) |
+++ chrome/browser/safe_browsing/protocol_manager.h (working copy) |
@@ -36,8 +36,8 @@ |
// specifying this). |
namespace __gnu_cxx { |
template<> |
-struct hash<const URLFetcher*> { |
- size_t operator()(const URLFetcher* fetcher) const { |
+struct hash<const content::URLFetcher*> { |
+ size_t operator()(const content::URLFetcher* fetcher) const { |
return reinterpret_cast<size_t>(fetcher); |
} |
}; |
@@ -103,7 +103,7 @@ |
virtual void Initialize(); |
// content::URLFetcherDelegate interface. |
- virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE; |
+ virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE; |
// API used by the SafeBrowsingService for issuing queries. When the results |
// are available, SafeBrowsingService::HandleGetHashResults is called. |
@@ -311,7 +311,7 @@ |
// Current active request (in case we need to cancel) for updates or chunks |
// from the SafeBrowsing service. We can only have one of these outstanding |
// at any given time unlike GetHash requests, which are tracked separately. |
- scoped_ptr<URLFetcher> request_; |
+ scoped_ptr<content::URLFetcher> request_; |
// The kind of request that is currently in progress. |
SafeBrowsingRequestType request_type_; |
@@ -339,7 +339,7 @@ |
std::deque<ChunkUrl> chunk_request_urls_; |
// Map of GetHash requests. |
- typedef base::hash_map<const URLFetcher*, |
+ typedef base::hash_map<const content::URLFetcher*, |
SafeBrowsingService::SafeBrowsingCheck*> HashRequests; |
HashRequests hash_requests_; |
@@ -381,7 +381,7 @@ |
// Track outstanding SafeBrowsing report fetchers for clean up. |
// We add both "hit" and "detail" fetchers in this set. |
- std::set<const URLFetcher*> safebrowsing_reports_; |
+ std::set<const content::URLFetcher*> safebrowsing_reports_; |
// The safe browsing client name sent in each request. |
std::string client_name_; |