content: ResourceType cleanup.

content/child/site_isolation_policy.h

 // Copyright 2013 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_CHILD_SITE_ISOLATION_POLICY_H_
 #define CONTENT_CHILD_SITE_ISOLATION_POLICY_H_
 
 #include <map>
 #include <utility>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/linked_ptr.h"
 #include "base/strings/string_piece.h"
 #include "content/common/content_export.h"
 #include "content/public/common/resource_type.h"
-
-class GURL;
+#include "url/gurl.h"
 
 namespace content {
 
 struct ResourceResponseInfo;
 
 // SiteIsolationPolicy implements the cross-site document blocking policy (XSDP)
 // for Site Isolation. XSDP will monitor network responses to a renderer and
 // block illegal responses so that a compromised renderer cannot steal private
 // information from other sites. For now SiteIsolationPolicy monitors responses
 // to gather various UMA stats to see the compatibility impact of actual
@@ skipping 20 matching lines @@
 // SiteIsolation.XSD.[%MIMETYPE].NoSniffBlocked.NonRenderableStatusCode :
 //   # of responses failed to be sniffed for its MIME type, but blocked by
 //   "X-Content-Type-Options: nosniff" header, and with non-renderable status
 //   code out of SiteIsolation.XSD.[%MIMETYPE].Blocked.
 // SiteIsolation.XSD.[%MIMETYPE].NotBlocked :
 //   # of responses, but not blocked due to failure of mime sniffing.
 // SiteIsolation.XSD.[%MIMETYPE].NotBlocked.MaybeJS :
 //   # of responses that are plausibly sniffed to be JavaScript.
 
 struct SiteIsolationResponseMetaData {
-
   enum CanonicalMimeType {
     HTML = 0,
     XML = 1,
     JSON = 2,
     Plain = 3,
     Others = 4,
     MaxCanonicalMimeType,
   };
 
   SiteIsolationResponseMetaData();
 
   std::string frame_origin;
   GURL response_url;
-  ResourceType::Type resource_type;
+  ResourceType resource_type;
   CanonicalMimeType canonical_mime_type;
   int http_status_code;
   bool no_sniff;
 };
 
 class CONTENT_EXPORT SiteIsolationPolicy {
  public:
   // Set activation flag for the UMA data collection for this renderer process.
   static void SetPolicyEnabled(bool enabled);
 
   // Returns any bookkeeping data about the HTTP header information for the
   // request identified by |request_id|. Any data returned should then be
   // passed to ShouldBlockResponse with the first packet.
   static linked_ptr<SiteIsolationResponseMetaData> OnReceivedResponse(
       const GURL& frame_origin,
       const GURL& response_url,
-      ResourceType::Type resource_type,
+      ResourceType resource_type,
       int origin_pid,
       const ResourceResponseInfo& info);
 
   // Examines the first network packet in case response_url is registered as a
   // cross-site document by DidReceiveResponse().  In case that this response is
   // blocked, it returns an alternative data to be sent to the renderer in
   // |alternative_data|. This records various kinds of UMA data stats. This
   // function is called only if the length of received data is non-zero.
   static bool ShouldBlockResponse(
       linked_ptr<SiteIsolationResponseMetaData>& resp_data, const char* payload,
@@ skipping 44 matching lines @@
   // Never needs to be constructed/destructed.
   SiteIsolationPolicy() {}
   ~SiteIsolationPolicy() {}
 
   DISALLOW_COPY_AND_ASSIGN(SiteIsolationPolicy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_SITE_ISOLATION_POLICY_H_