Moves Blink mixed content enums and helper methods to public.

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

 // Copyright 2014 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 "core/loader/MixedContentChecker.h"
 
+#include "core/frame/Settings.h"
 #include "core/loader/EmptyClients.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/network/ResourceResponse.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "testing/gmock/include/gmock/gmock-generated-function-mockers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/RefPtr.h"
 #include <base/macros.h>
 
@@ skipping 29 matching lines @@
 }
 
 TEST(MixedContentCheckerTest, ContextTypeForInspector)
 {
     OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create(IntSize(1, 1));
     dummyPageHolder->frame().document()->setSecurityOrigin(SecurityOrigin::createFromString("http://example.test"));
 
     ResourceRequest notMixedContent("https://example.test/foo.jpg");
     notMixedContent.setFrameType(WebURLRequest::FrameTypeAuxiliary);
     notMixedContent.setRequestContext(WebURLRequest::RequestContextScript);
-    EXPECT_EQ(MixedContentChecker::ContextTypeNotMixedContent, MixedContentChecker::contextTypeForInspector(&dummyPageHolder->frame(), notMixedContent));
+    EXPECT_EQ(WebMixedContent::ContextType::NotMixedContent, MixedContentChecker::contextTypeForInspector(&dummyPageHolder->frame(), notMixedContent));
 
     dummyPageHolder->frame().document()->setSecurityOrigin(SecurityOrigin::createFromString("https://example.test"));
-    EXPECT_EQ(MixedContentChecker::ContextTypeNotMixedContent, MixedContentChecker::contextTypeForInspector(&dummyPageHolder->frame(), notMixedContent));
+    EXPECT_EQ(WebMixedContent::ContextType::NotMixedContent, MixedContentChecker::contextTypeForInspector(&dummyPageHolder->frame(), notMixedContent));
 
     ResourceRequest blockableMixedContent("http://example.test/foo.jpg");
     blockableMixedContent.setFrameType(WebURLRequest::FrameTypeAuxiliary);
     blockableMixedContent.setRequestContext(WebURLRequest::RequestContextScript);
-    EXPECT_EQ(MixedContentChecker::ContextTypeBlockable, MixedContentChecker::contextTypeForInspector(&dummyPageHolder->frame(), blockableMixedContent));
+    EXPECT_EQ(WebMixedContent::ContextType::Blockable, MixedContentChecker::contextTypeForInspector(&dummyPageHolder->frame(), blockableMixedContent));
 
     ResourceRequest optionallyBlockableMixedContent("http://example.test/foo.jpg");
     blockableMixedContent.setFrameType(WebURLRequest::FrameTypeAuxiliary);
     blockableMixedContent.setRequestContext(WebURLRequest::RequestContextImage);
-    EXPECT_EQ(MixedContentChecker::ContextTypeOptionallyBlockable, MixedContentChecker::contextTypeForInspector(&dummyPageHolder->frame(), blockableMixedContent));
+    EXPECT_EQ(WebMixedContent::ContextType::OptionallyBlockable, MixedContentChecker::contextTypeForInspector(&dummyPageHolder->frame(), blockableMixedContent));
 }
 
 namespace {
 
     class MockFrameLoaderClient : public EmptyFrameLoaderClient {
     public:
         MockFrameLoaderClient()
             : EmptyFrameLoaderClient()
         {
         }
@@ skipping 14 matching lines @@
 
     dummyPageHolder->frame().document()->setURL(mainResourceUrl);
     ResourceResponse response1;
     response1.setURL(ranUrl);
     response1.setSecurityInfo("security info1");
     EXPECT_CALL(*client, didRunContentWithCertificateErrors(ranUrl, response1.getSecurityInfo()));
     MixedContentChecker::handleCertificateError(&dummyPageHolder->frame(), response1, WebURLRequest::FrameTypeNone, WebURLRequest::RequestContextScript);
 
     ResourceResponse response2;
     WebURLRequest::RequestContext requestContext = WebURLRequest::RequestContextImage;
-    ASSERT_EQ(MixedContentChecker::ContextTypeOptionallyBlockable, MixedContentChecker::contextTypeFromContext(requestContext, &dummyPageHolder->frame()));
+    ASSERT_EQ(WebMixedContent::ContextType::OptionallyBlockable, WebMixedContent::contextTypeFromRequestContext(requestContext, dummyPageHolder->frame().settings()->strictMixedContentCheckingForPlugin()));
     response2.setURL(displayedUrl);
     response2.setSecurityInfo("security info2");
     EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(displayedUrl, response2.getSecurityInfo()));
     MixedContentChecker::handleCertificateError(&dummyPageHolder->frame(), response2, WebURLRequest::FrameTypeNone, requestContext);
 }
 
 } // namespace blink