Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1205)

Unified Diff: chrome/common/secure_origin_whitelist_unittest.cc

Issue 2623353002: Share schemes needed for mixed content checking between the browser and renderer. (Closed)
Patch Set: remove unused public methods Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/secure_origin_whitelist_unittest.cc
diff --git a/chrome/common/secure_origin_whitelist_unittest.cc b/chrome/common/secure_origin_whitelist_unittest.cc
index 6865d15b805d0f48074888bd8cc6e0265a075bd7..1c8e175127bd8648b1f99949c3aa2a35461adeba 100644
--- a/chrome/common/secure_origin_whitelist_unittest.cc
+++ b/chrome/common/secure_origin_whitelist_unittest.cc
@@ -6,6 +6,7 @@
#include "base/test/scoped_command_line.h"
#include "chrome/common/chrome_switches.h"
#include "content/public/common/origin_util.h"
+#include "content/public/test/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
@@ -16,7 +17,7 @@ namespace chrome {
class SecureOriginWhiteListTest : public testing::Test {
void TearDown() override {
// Ensure that we reset the whitelisted origins without any flags applied.
- content::ResetSchemesAndOriginsWhitelistForTesting();
+ content::ResetSchemesAndOriginsWhitelist();
};
};
@@ -34,7 +35,7 @@ TEST_F(SecureOriginWhiteListTest, UnsafelyTreatInsecureOriginAsSecure) {
switches::kUnsafelyTreatInsecureOriginAsSecure,
"http://example.com,http://127.example.com");
command_line->AppendSwitch(switches::kUserDataDir);
- content::ResetSchemesAndOriginsWhitelistForTesting();
+ content::ResetSchemesAndOriginsWhitelist();
// They should be now white-listed.
EXPECT_TRUE(content::IsOriginSecure(GURL("http://example.com/a.html")));
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698