doc.write intervention warning message changed to replace cross-origin with cross site (etdl+1)

chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc

Index: chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc
diff --git a/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc
index 2c543d1e587876b547ccef17c03a7f2a2947ce03..6f6a8c26251435af3b494a72912f3175faf39d92 100644
--- a/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/document_write_page_load_metrics_observer.cc
@@ -71,6 +71,8 @@ const char kHistogramDocWriteBlockCount[] =
     "PageLoad.Clients.DocWrite.Block.Count";
 const char kHistogramDocWriteBlockReloadCount[] =
     "PageLoad.Clients.DocWrite.Block.ReloadCount";
+const char kHistogramDocWriteBlockLoadingBehavior[] =
+    "PageLoad.Clients.DocWrite.Block.DocumentWriteLoadingBehavior";
 
 }  // namespace internal
 
@@ -123,14 +125,27 @@ void DocumentWritePageLoadMetricsObserver::OnLoadingBehaviorObserved(
         !(info.metadata.behavior_flags &
           blink::WebLoadingBehaviorFlag::WebLoadingBehaviorDocumentWriteBlock));
     UMA_HISTOGRAM_COUNTS(internal::kHistogramDocWriteBlockReloadCount, 1);
+    UMA_HISTOGRAM_ENUMERATION(internal::kHistogramDocWriteBlockLoadingBehavior,

[Steven Holte, 2017/01/27 20:41:05]

Putting this into a helper function in anonymous namespace rather than invoking
the macro 3 times.

+                              LOADING_BEHAVIOR_RELOAD, LOADING_BEHAVIOR_MAX);
     doc_write_block_reload_observed_ = true;
   }
   if ((info.metadata.behavior_flags &
        blink::WebLoadingBehaviorFlag::WebLoadingBehaviorDocumentWriteBlock) &&
       !doc_write_block_observed_) {
     UMA_HISTOGRAM_BOOLEAN(internal::kHistogramDocWriteBlockCount, true);
+    UMA_HISTOGRAM_ENUMERATION(internal::kHistogramDocWriteBlockLoadingBehavior,
+                              LOADING_BEHAVIOR_BLOCK, LOADING_BEHAVIOR_MAX);
     doc_write_block_observed_ = true;
   }
+  if ((info.metadata.behavior_flags &
+       blink::WebLoadingBehaviorFlag::
+           WebLoadingBehaviorDocumentWriteBlockDifferentScheme) &&
+      !doc_write_same_site_diff_scheme_) {
+    UMA_HISTOGRAM_ENUMERATION(internal::kHistogramDocWriteBlockLoadingBehavior,
+                              LOADING_BEHAVIOR_SAME_SITE_DIFF_SCHEME,
+                              LOADING_BEHAVIOR_MAX);
+    doc_write_same_site_diff_scheme_ = true;
+  }
 }
 
 void DocumentWritePageLoadMetricsObserver::