WebRequest API: add more resource types

content/child/site_isolation_stats_gatherer_browsertest.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 "base/command_line.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/histogram_tester.h"
 #include "content/public/common/content_switches.h"
@@ skipping 63 matching lines @@
     // A few histograms are incremented unconditionally.
     histograms.ExpectUniqueSample("SiteIsolation.AllResponses", 1, 1);
     base::HistogramTester::CountsMap expected_metrics;
     expected_metrics["SiteIsolation.XSD.DataLength"] = 1;
     expected_metrics["SiteIsolation.XSD.MimeType"] = 1;
 
     // Determine the appropriate conditionally-incremented histograms.
     std::string base = "SiteIsolation.XSD." + bucket;
     if (should_be_blocked) {
       expected_metrics[base + ".Blocked"] = 1;
-      expected_metrics[base + ".Blocked.RenderableStatusCode"] = 1;
+      expected_metrics[base + ".Blocked.RenderableStatusCode2"] = 1;
     } else {
       expected_metrics[base + ".NotBlocked"] = 1;
       if (base::MatchPattern(resource_name, "*js.*")) {
         expected_metrics[base + ".NotBlocked.MaybeJS"] = 1;
       }
     }
 
     // Make sure that the expected metrics, and only those metrics, were
     // incremented.
     EXPECT_THAT(histograms.GetTotalCountsForPrefix("SiteIsolation.XSD."),
                 testing::ContainerEq(expected_metrics))
         << "For resource_name=" << resource_name
         << ", should_be_blocked=" << should_be_blocked;
 
     EXPECT_THAT(histograms.GetAllSamples("SiteIsolation.XSD.MimeType"),
                 testing::ElementsAre(base::Bucket(mime_type, 1)))
         << "The wrong mime type bucket was incremented.";
     if (should_be_blocked) {
       static_assert(13 == RESOURCE_TYPE_XHR, "Histogram enums mustn't change.");
       EXPECT_THAT(
-          histograms.GetAllSamples(base + ".Blocked.RenderableStatusCode"),
+          histograms.GetAllSamples(base + ".Blocked.RenderableStatusCode2"),
           testing::ElementsAre(base::Bucket(RESOURCE_TYPE_XHR, 1)))
-          << "The wrong RenderableStatusCode bucket was incremented.";
+          << "The wrong RenderableStatusCode2 bucket was incremented.";
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SiteIsolationStatsGathererBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(SiteIsolationStatsGathererBrowserTest,
                        CrossSiteDocumentBlockingForMimeType) {
   // Load a page that issues illegal cross-site document requests to bar.com.
@@ skipping 72 matching lines @@
   // length is different from what's described in "content-length" for such
   // different targets.
 
   // TODO(nick): Split up these cases, and add positive assertions here about
   // what actually happens in these various resource-block cases.
   GURL foo("http://foo.com/cross_site_document_request_target.html");
   NavigateToURL(shell(), foo);
 }
 
 }  // namespace content