Cleanup ResourceDispatcher::PendingRequestInfo

content/child/site_isolation_stats_gatherer.cc

 // Copyright 2015 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_stats_gatherer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 35 matching lines @@
                             uint32_t boundary_value) {
   // The default value of min, max, bucket_count are copied from histogram.h.
   base::HistogramBase* histogram_pointer = base::LinearHistogram::FactoryGet(
       name, 1, boundary_value, boundary_value + 1,
       base::HistogramBase::kUmaTargetedHistogramFlag);
   histogram_pointer->Add(sample);
 }
 
 void HistogramCountBlockedResponse(
     const std::string& bucket_prefix,
-    const linked_ptr<SiteIsolationResponseMetaData>& resp_data,
+    const scoped_ptr<SiteIsolationResponseMetaData>& resp_data,
     bool nosniff_block) {
   std::string block_label(nosniff_block ? ".NoSniffBlocked" : ".Blocked");
   IncrementHistogramCount(bucket_prefix + block_label);
 
   // The content is blocked if it is sniffed as HTML/JSON/XML. When
   // the blocked response is with an error status code, it is not
   // disruptive for the following reasons : 1) the blocked content is
   // not a binary object (such as an image) since it is sniffed as
   // text; 2) then, this blocking only breaks the renderer behavior
   // only if it is either JavaScript or CSS. However, the renderer
@@ skipping 22 matching lines @@
 
 }  // namespace
 
 SiteIsolationResponseMetaData::SiteIsolationResponseMetaData() {
 }
 
 void SiteIsolationStatsGatherer::SetEnabled(bool enabled) {
   g_stats_gathering_enabled = enabled;
 }
 
-linked_ptr<SiteIsolationResponseMetaData>
+scoped_ptr<SiteIsolationResponseMetaData>
 SiteIsolationStatsGatherer::OnReceivedResponse(
     const GURL& frame_origin,
     const GURL& response_url,
     ResourceType resource_type,
     int origin_pid,
     const ResourceResponseInfo& info) {
   if (!g_stats_gathering_enabled)
-    return linked_ptr<SiteIsolationResponseMetaData>();
+    return nullptr;
 
   // 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>();
+    return nullptr;
 
   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 (IsResourceTypeFrame(resource_type))
-    return linked_ptr<SiteIsolationResponseMetaData>();
+    return nullptr;
 
   if (!CrossSiteDocumentClassifier::IsBlockableScheme(response_url))
-    return linked_ptr<SiteIsolationResponseMetaData>();
+    return nullptr;
 
   if (CrossSiteDocumentClassifier::IsSameSite(frame_origin, response_url))
-    return linked_ptr<SiteIsolationResponseMetaData>();
+    return nullptr;
 
   CrossSiteDocumentMimeType canonical_mime_type =
       CrossSiteDocumentClassifier::GetCanonicalMimeType(info.mime_type);
 
   if (canonical_mime_type == CROSS_SITE_DOCUMENT_MIME_TYPE_OTHERS)
-    return linked_ptr<SiteIsolationResponseMetaData>();
+    return nullptr;
 
   // Every CORS request should have the Access-Control-Allow-Origin header even
   // if it is preceded by a pre-flight request. Therefore, if this is a CORS
   // request, it has this header.  response.httpHeaderField() internally uses
   // case-insensitive matching for the header name.
   std::string access_control_origin;
 
   // We can use a case-insensitive header name for EnumerateHeader().
   info.headers->EnumerateHeader(NULL, "access-control-allow-origin",
                                 &access_control_origin);
   if (CrossSiteDocumentClassifier::IsValidCorsHeaderSet(
           frame_origin, response_url, access_control_origin))
-    return linked_ptr<SiteIsolationResponseMetaData>();
+    return nullptr;
 
   // Real XSD data collection starts from here.
   std::string no_sniff;
   info.headers->EnumerateHeader(NULL, "x-content-type-options", &no_sniff);
 
-  linked_ptr<SiteIsolationResponseMetaData> resp_data(
+  scoped_ptr<SiteIsolationResponseMetaData> resp_data(
       new SiteIsolationResponseMetaData);
   resp_data->frame_origin = frame_origin.spec();
   resp_data->response_url = response_url;
   resp_data->resource_type = resource_type;
   resp_data->canonical_mime_type = canonical_mime_type;
   resp_data->http_status_code = info.headers->response_code();
   resp_data->no_sniff = base::LowerCaseEqualsASCII(no_sniff, "nosniff");
 
   return resp_data;
 }
 
 bool SiteIsolationStatsGatherer::OnReceivedFirstChunk(
-    const linked_ptr<SiteIsolationResponseMetaData>& resp_data,
+    const scoped_ptr<SiteIsolationResponseMetaData>& resp_data,
     const char* raw_data,
     int raw_length) {
   if (!g_stats_gathering_enabled)
     return false;
 
   DCHECK(resp_data.get());
 
   base::StringPiece data(raw_data, raw_length);
 
   // Record the length of the first received chunk of data to see if it's enough
@@ skipping 75 matching lines @@
 }
 
 bool SiteIsolationStatsGatherer::SniffForJS(base::StringPiece data) {
   // The purpose of this function is to try to see if there's any possibility
   // that this data can be JavaScript (superset of JS). Search for "var " for JS
   // detection. This is a real hack and should only be used for stats gathering.
   return data.find("var ") != base::StringPiece::npos;
 }
 
 }  // namespace content