[Patch 3 of 6] Split out content/child's SiteIsolationPolicy into two new classes.

content/child/site_isolation_policy.h

Index: content/child/site_isolation_policy.h
diff --git a/content/child/site_isolation_policy.h b/content/child/site_isolation_policy.h
index 3565447b76a32fe420aedf05161fe7eabc87d504..f621a1dfdf40f5ed7616ef772dae3cb529a13ad3 100644
--- a/content/child/site_isolation_policy.h
+++ b/content/child/site_isolation_policy.h
@@ -19,13 +19,14 @@ 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
-// deployment of the policy. The UMA stat categories SiteIsolationPolicy gathers
-// are as follows:
+// CrossSiteDocumentClassifier 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.
+//
+// SiteIsolationStatsGatherer monitors responses to gather various UMA stats to
+// see the compatibility impact of actual deployment of the policy. The UMA stat
+// categories SiteIsolationStatsGatherer gathers are as follows:
 //
 // SiteIsolation.AllResponses : # of all network responses.
 // SiteIsolation.XSD.DataLength : the length of the first packet of a response.
@@ -73,10 +74,11 @@ struct SiteIsolationResponseMetaData {
   bool no_sniff;
 };
 
-class CONTENT_EXPORT SiteIsolationPolicy {
+// TODO(nick): Move this class into its own file.
+class CONTENT_EXPORT SiteIsolationStatsGatherer {
  public:
   // Set activation flag for the UMA data collection for this renderer process.
-  static void SetPolicyEnabled(bool enabled);
+  static void SetEnabled(bool enabled);
 
   // Returns any bookkeeping data about the HTTP header information for the
   // request identified by |request_id|. Any data returned should then be

[alexmos, 2015/06/11 20:17:48]

nit: there's no request_id passed to this function (anymore?), so maybe update
this comment.

[ncarter (slow), 2015/06/16 20:51:13]

Done.

@@ -89,23 +91,27 @@ class CONTENT_EXPORT SiteIsolationPolicy {
       const ResourceResponseInfo& info);
 
   // Examines the first chunk of network data in case response_url is registered
-  // as a cross-site document by DidReceiveResponse(). This records various
+  // as a cross-site document by OnReceivedResponse(). This records various
   // kinds of UMA data stats. This function is called only if the length of
   // received data is non-zero.
   static bool OnReceivedFirstChunk(
       const linked_ptr<SiteIsolationResponseMetaData>& resp_data,
       const char* payload,
       int length);
-
  private:

[alexmos, 2015/06/11 20:17:48]

nit: blank line before private:?

[ncarter (slow), 2015/06/16 20:51:13]

Done.

-  FRIEND_TEST_ALL_PREFIXES(SiteIsolationPolicyTest, IsBlockableScheme);
-  FRIEND_TEST_ALL_PREFIXES(SiteIsolationPolicyTest, IsSameSite);
-  FRIEND_TEST_ALL_PREFIXES(SiteIsolationPolicyTest, IsValidCorsHeaderSet);
-  FRIEND_TEST_ALL_PREFIXES(SiteIsolationPolicyTest, SniffForHTML);
-  FRIEND_TEST_ALL_PREFIXES(SiteIsolationPolicyTest, SniffForXML);
-  FRIEND_TEST_ALL_PREFIXES(SiteIsolationPolicyTest, SniffForJSON);
-  FRIEND_TEST_ALL_PREFIXES(SiteIsolationPolicyTest, SniffForJS);
+  FRIEND_TEST_ALL_PREFIXES(SiteIsolationStatsGathererTest, SniffForJS);
+
+  SiteIsolationStatsGatherer();  // Not instantiable.
 
+  // Imprecise JS sniffing; only appropriate for collecting UMA stat.
+  static bool SniffForJS(base::StringPiece data);
+
+  DISALLOW_COPY_AND_ASSIGN(SiteIsolationStatsGatherer);
+};
+
+// TODO(nick): Move this class into its own file.
+class CONTENT_EXPORT CrossSiteDocumentClassifier {
+ public:
   // Returns the representative mime type enum value of the mime type of
   // response. For example, this returns the same value for all text/xml mime
   // type families such as application/xml, application/rss+xml.
@@ -135,15 +141,10 @@ class CONTENT_EXPORT SiteIsolationPolicy {
   static bool SniffForXML(base::StringPiece data);
   static bool SniffForJSON(base::StringPiece data);
 
-  // TODO(dsjang): this is only needed for collecting UMA stat. Will be deleted
-  // when this class is used for actual blocking.
-  static bool SniffForJS(base::StringPiece data);
-
-  // Never needs to be constructed/destructed.
-  SiteIsolationPolicy() {}
-  ~SiteIsolationPolicy() {}
+ private:
+  CrossSiteDocumentClassifier();  // Not instantiable.
 
-  DISALLOW_COPY_AND_ASSIGN(SiteIsolationPolicy);
+  DISALLOW_COPY_AND_ASSIGN(CrossSiteDocumentClassifier);
 };
 
 }  // namespace content