Safebrowsing: Honor the metadata from malware fullhash results in SB API 3.0.

chrome/browser/renderer_host/safe_browsing_resource_throttle.h

 // 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 CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_H_
 #define CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/safe_browsing/database_manager.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "content/public/browser/resource_throttle.h"
+#include "content/public/common/resource_type.h"
 
 class ResourceDispatcherHost;
 
 namespace net {
 class URLRequest;
 }
 
 // SafeBrowsingResourceThrottle checks that URLs are "safe" before navigating
 // to them. To be considered "safe", a URL must not appear in the
 // malware/phishing blacklists (see SafeBrowsingService for details).
@@ skipping 15 matching lines @@
 // Once the safe browsing check has completed, if the URL was decided to be
 // dangerous, a warning page is thrown up and the request remains suspended.
 // If on the other hand the URL was decided to be safe, the request is
 // resumed.
 class SafeBrowsingResourceThrottle
     : public content::ResourceThrottle,
       public SafeBrowsingDatabaseManager::Client,
       public base::SupportsWeakPtr<SafeBrowsingResourceThrottle> {
  public:
   SafeBrowsingResourceThrottle(const net::URLRequest* request,
-                               bool is_subresource,
+                               content::ResourceType resource_type,
                                SafeBrowsingService* safe_browsing);
 
   // content::ResourceThrottle implementation (called on IO thread):
   virtual void WillStartRequest(bool* defer) OVERRIDE;
   virtual void WillRedirectRequest(const GURL& new_url, bool* defer) OVERRIDE;
   virtual const char* GetNameForLogging() const OVERRIDE;
 
   // SafeBrowsingDabaseManager::Client implementation (called on IO thread):
-  virtual void OnCheckBrowseUrlResult(
-      const GURL& url, SBThreatType result) OVERRIDE;
+  virtual void OnCheckBrowseUrlResult(const GURL& url,
+                                      SBThreatType result,
+                                      const std::string& metadata) OVERRIDE;
 
  private:
   // Describes what phase of the check a throttle is in.
   enum State {
     STATE_NONE,
     STATE_CHECKING_URL,
     STATE_DISPLAYING_BLOCKING_PAGE,
   };
 
   // Describes what stage of the request got paused by the check.
@@ skipping 46 matching lines @@
   base::OneShotTimer<SafeBrowsingResourceThrottle> timer_;
 
   // The redirect chain for this resource
   std::vector<GURL> redirect_urls_;
 
   GURL url_being_checked_;
 
   scoped_refptr<SafeBrowsingDatabaseManager> database_manager_;
   scoped_refptr<SafeBrowsingUIManager> ui_manager_;
   const net::URLRequest* request_;
-  bool is_subresource_;
+  const bool is_subresource_;
+  const bool is_subframe_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingResourceThrottle);
 };
 
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_H_