content: ResourceType cleanup.

content/child/site_isolation_policy.cc

 // 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.
 
 #include "content/child/site_isolation_policy.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 99 matching lines @@
   // doesn't use the contents of JS/CSS with unaffected status code
   // (e.g, 404). 3) the renderer is expected not to use the cross-site
   // document content for purposes other than JS/CSS (e.g, XHR).
   bool renderable_status_code =
       IsRenderableStatusCode(resp_data->http_status_code);
 
   if (renderable_status_code) {
     IncrementHistogramEnum(
         bucket_prefix + block_label + ".RenderableStatusCode",
         resp_data->resource_type,
-        ResourceType::LAST_TYPE);
+        RESOURCE_TYPE_LAST_TYPE);
   } else {
     IncrementHistogramCount(bucket_prefix + block_label +
                             ".NonRenderableStatusCode");
   }
 }
 
 void HistogramCountNotBlockedResponse(const std::string& bucket_prefix,
                                       bool sniffed_as_js) {
   IncrementHistogramCount(bucket_prefix + ".NotBlocked");
   if (sniffed_as_js)
     IncrementHistogramCount(bucket_prefix + ".NotBlocked.MaybeJS");
 }
 
 }  // namespace
 
 SiteIsolationResponseMetaData::SiteIsolationResponseMetaData() {}
 
 void SiteIsolationPolicy::SetPolicyEnabled(bool enabled) {
   g_policy_enabled = enabled;
 }
 
 linked_ptr<SiteIsolationResponseMetaData>
 SiteIsolationPolicy::OnReceivedResponse(const GURL& frame_origin,
                                         const GURL& response_url,
-                                        ResourceType::Type resource_type,
+                                        ResourceType resource_type,
                                         int origin_pid,
                                         const ResourceResponseInfo& info) {
   if (!g_policy_enabled)
     return linked_ptr<SiteIsolationResponseMetaData>();
 
   // if |origin_pid| is non-zero, it means that this response is for a plugin
   // spawned from this renderer process. We exclude responses for plugins for
   // now, but eventually, we're going to make plugin processes directly talk to
   // the browser process so that we don't apply cross-site document blocking to
   // them.
   if (origin_pid)
     return linked_ptr<SiteIsolationResponseMetaData>();
 
   UMA_HISTOGRAM_COUNTS("SiteIsolation.AllResponses", 1);
 
   // See if this is for navigation. If it is, don't block it, under the
   // assumption that we will put it in an appropriate process.
-  if (ResourceType::IsFrame(resource_type))
+  if (IsResourceTypeFrame(resource_type))
     return linked_ptr<SiteIsolationResponseMetaData>();
 
   if (!IsBlockableScheme(response_url))
     return linked_ptr<SiteIsolationResponseMetaData>();
 
   if (IsSameSite(frame_origin, response_url))
     return linked_ptr<SiteIsolationResponseMetaData>();
 
   SiteIsolationResponseMetaData::CanonicalMimeType canonical_mime_type =
       GetCanonicalMimeType(info.mime_type);
@@ skipping 330 matching lines @@
   // TODO(dsjang): This is a real hack. The only purpose of this function is to
   // try to see if there's any possibility that this data can be JavaScript
   // (superset of JS). This function will be removed once UMA stats are
   // gathered.
 
   // Search for "var " for JS detection.
   return data.find("var ") != base::StringPiece::npos;
 }
 
 }  // namespace content