Supporting changes in preparation of browser side mixed content checking.

third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp

Index: third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp
diff --git a/third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp b/third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp
index 3323b620ed051de2d2bcc125b1651d2ba36371fb..831dfa1675b0f10f7189c5fb5d1b7af4b874584c 100644
--- a/third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp
+++ b/third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp
@@ -10,6 +10,8 @@
 #include "platform/network/ResourceResponse.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
+#include "public/platform/WebMixedContent.h"
+#include "public/platform/WebMixedContentContextType.h"
 #include "testing/gmock/include/gmock/gmock-generated-function-mockers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/RefPtr.h"
@@ -68,20 +70,20 @@ TEST(MixedContentCheckerTest, ContextTypeForInspector) {
   ResourceRequest notMixedContent("https://example.test/foo.jpg");
   notMixedContent.setFrameType(WebURLRequest::FrameTypeAuxiliary);
   notMixedContent.setRequestContext(WebURLRequest::RequestContextScript);
-  EXPECT_EQ(WebMixedContent::ContextType::NotMixedContent,
+  EXPECT_EQ(WebMixedContentContextType::NotMixedContent,
             MixedContentChecker::contextTypeForInspector(
                 &dummyPageHolder->frame(), notMixedContent));
 
   dummyPageHolder->frame().document()->setSecurityOrigin(
       SecurityOrigin::createFromString("https://example.test"));
-  EXPECT_EQ(WebMixedContent::ContextType::NotMixedContent,
+  EXPECT_EQ(WebMixedContentContextType::NotMixedContent,
             MixedContentChecker::contextTypeForInspector(
                 &dummyPageHolder->frame(), notMixedContent));
 
   ResourceRequest blockableMixedContent("http://example.test/foo.jpg");
   blockableMixedContent.setFrameType(WebURLRequest::FrameTypeAuxiliary);
   blockableMixedContent.setRequestContext(WebURLRequest::RequestContextScript);
-  EXPECT_EQ(WebMixedContent::ContextType::Blockable,
+  EXPECT_EQ(WebMixedContentContextType::Blockable,
             MixedContentChecker::contextTypeForInspector(
                 &dummyPageHolder->frame(), blockableMixedContent));
 
@@ -89,7 +91,7 @@ TEST(MixedContentCheckerTest, ContextTypeForInspector) {
       "http://example.test/foo.jpg");
   blockableMixedContent.setFrameType(WebURLRequest::FrameTypeAuxiliary);
   blockableMixedContent.setRequestContext(WebURLRequest::RequestContextImage);
-  EXPECT_EQ(WebMixedContent::ContextType::OptionallyBlockable,
+  EXPECT_EQ(WebMixedContentContextType::OptionallyBlockable,
             MixedContentChecker::contextTypeForInspector(
                 &dummyPageHolder->frame(), blockableMixedContent));
 }
@@ -126,7 +128,7 @@ TEST(MixedContentCheckerTest, HandleCertificateError) {
   WebURLRequest::RequestContext requestContext =
       WebURLRequest::RequestContextImage;
   ASSERT_EQ(
-      WebMixedContent::ContextType::OptionallyBlockable,
+      WebMixedContentContextType::OptionallyBlockable,
       WebMixedContent::contextTypeFromRequestContext(
           requestContext, dummyPageHolder->frame()
                               .settings()