| Index: chrome/browser/safe_browsing/threat_details_cache.h
|
| diff --git a/chrome/browser/safe_browsing/threat_details_cache.h b/chrome/browser/safe_browsing/threat_details_cache.h
|
| index 417626430dc7436cbfbc77459f6847512ef08a6a..89c471d476f544f82a50c483935f31c6d4b90738 100644
|
| --- a/chrome/browser/safe_browsing/threat_details_cache.h
|
| +++ b/chrome/browser/safe_browsing/threat_details_cache.h
|
| @@ -27,11 +27,9 @@ class URLRequestContext;
|
| namespace safe_browsing {
|
|
|
| // Maps a URL to its Resource.
|
| -typedef base::hash_map<
|
| - std::string,
|
| - linked_ptr<safe_browsing::ClientMalwareReportRequest::Resource>>
|
| +typedef base::hash_map<std::string,
|
| + linked_ptr<ClientMalwareReportRequest::Resource>>
|
| ResourceMap;
|
| -}
|
|
|
| class ThreatDetailsCacheCollector
|
| : public base::RefCountedThreadSafe<ThreatDetailsCacheCollector>,
|
| @@ -44,7 +42,7 @@ class ThreatDetailsCacheCollector
|
| // for the lifetime of this object.
|
| void StartCacheCollection(
|
| net::URLRequestContextGetter* request_context_getter,
|
| - safe_browsing::ResourceMap* resources,
|
| + ResourceMap* resources,
|
| bool* result,
|
| const base::Closure& callback);
|
|
|
| @@ -63,10 +61,10 @@ class ThreatDetailsCacheCollector
|
|
|
| // Points to the url for which we are fetching the HTTP cache entry or
|
| // redirect chain.
|
| - safe_browsing::ResourceMap::iterator resources_it_;
|
| + ResourceMap::iterator resources_it_;
|
|
|
| // Points to the resources_ map in the ThreatDetails.
|
| - safe_browsing::ResourceMap* resources_;
|
| + ResourceMap* resources_;
|
|
|
| // Points to the cache_result_ in the ThreatDetails.
|
| bool* result_;
|
| @@ -85,21 +83,18 @@ class ThreatDetailsCacheCollector
|
| scoped_ptr<net::URLFetcher> current_fetch_;
|
|
|
| // Returns the resource from resources_ that corresponds to |url|
|
| - safe_browsing::ClientMalwareReportRequest::Resource* GetResource(
|
| - const GURL& url);
|
| + ClientMalwareReportRequest::Resource* GetResource(const GURL& url);
|
|
|
| // Creates a new URLFetcher and starts it.
|
| void OpenEntry();
|
|
|
| // Read the HTTP response from |source| and add it to |pb_resource|.
|
| - void ReadResponse(
|
| - safe_browsing::ClientMalwareReportRequest::Resource* pb_resource,
|
| - const net::URLFetcher* source);
|
| + void ReadResponse(ClientMalwareReportRequest::Resource* pb_resource,
|
| + const net::URLFetcher* source);
|
|
|
| // Read the body |data| and add it to |pb_resource|.
|
| - void ReadData(
|
| - safe_browsing::ClientMalwareReportRequest::Resource* pb_resource,
|
| - const std::string& data);
|
| + void ReadData(ClientMalwareReportRequest::Resource* pb_resource,
|
| + const std::string& data);
|
|
|
| // Called when we are done.
|
| void AllDone(bool success);
|
| @@ -108,4 +103,6 @@ class ThreatDetailsCacheCollector
|
| void AdvanceEntry();
|
| };
|
|
|
| +} // namespace safe_browsing
|
| +
|
| #endif // CHROME_BROWSER_SAFE_BROWSING_THREAT_DETAILS_CACHE_H_
|
|
|