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

Unified Diff: third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp

Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing (Closed)
Patch Set: Dropped mojo parts that need another review. Created 3 years, 5 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
Index: third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp
diff --git a/third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp b/third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp
index ce3d933db1811cb61fccf33fab86fda340cf3057..b8c10eec7e9e6c4347ccd049f92f4c0be0806d42 100644
--- a/third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp
+++ b/third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp
@@ -143,8 +143,8 @@ TEST(OriginAccessEntryTest, AllowSubdomainsTest) {
platform->SetPublicSuffix("com");
for (const auto& test : inputs) {
- SCOPED_TRACE(testing::Message() << "Host: " << test.host
- << ", Origin: " << test.origin);
+ SCOPED_TRACE(::testing::Message()
+ << "Host: " << test.host << ", Origin: " << test.origin);
RefPtr<SecurityOrigin> origin_to_test =
SecurityOrigin::CreateFromString(test.origin);
OriginAccessEntry entry1(test.protocol, test.host,
@@ -202,7 +202,7 @@ TEST(OriginAccessEntryTest, AllowRegisterableDomainsTest) {
OriginAccessEntry entry1(test.protocol, test.host,
OriginAccessEntry::kAllowRegisterableDomains);
- SCOPED_TRACE(testing::Message()
+ SCOPED_TRACE(::testing::Message()
<< "Host: " << test.host << ", Origin: " << test.origin
<< ", Domain: " << entry1.Registerable().Utf8().data());
EXPECT_EQ(test.expected, entry1.MatchesOrigin(*origin_to_test));
@@ -258,7 +258,7 @@ TEST(OriginAccessEntryTest, AllowRegisterableDomainsTestWithDottedSuffix) {
OriginAccessEntry entry1(test.protocol, test.host,
OriginAccessEntry::kAllowRegisterableDomains);
- SCOPED_TRACE(testing::Message()
+ SCOPED_TRACE(::testing::Message()
<< "Host: " << test.host << ", Origin: " << test.origin
<< ", Domain: " << entry1.Registerable().Utf8().data());
EXPECT_EQ(test.expected, entry1.MatchesOrigin(*origin_to_test));
@@ -304,8 +304,8 @@ TEST(OriginAccessEntryTest, DisallowSubdomainsTest) {
platform->SetPublicSuffix("com");
for (const auto& test : inputs) {
- SCOPED_TRACE(testing::Message() << "Host: " << test.host
- << ", Origin: " << test.origin);
+ SCOPED_TRACE(::testing::Message()
+ << "Host: " << test.host << ", Origin: " << test.origin);
RefPtr<SecurityOrigin> origin_to_test =
SecurityOrigin::CreateFromString(test.origin);
OriginAccessEntry entry1(test.protocol, test.host,
@@ -335,7 +335,7 @@ TEST(OriginAccessEntryTest, IPAddressTest) {
platform->SetPublicSuffix("com");
for (const auto& test : inputs) {
- SCOPED_TRACE(testing::Message() << "Host: " << test.host);
+ SCOPED_TRACE(::testing::Message() << "Host: " << test.host);
OriginAccessEntry entry(test.protocol, test.host,
OriginAccessEntry::kDisallowSubdomains);
EXPECT_EQ(test.is_ip_address, entry.HostIsIPAddress()) << test.host;
@@ -363,8 +363,8 @@ TEST(OriginAccessEntryTest, IPAddressMatchingTest) {
platform->SetPublicSuffix("com");
for (const auto& test : inputs) {
- SCOPED_TRACE(testing::Message() << "Host: " << test.host
- << ", Origin: " << test.origin);
+ SCOPED_TRACE(::testing::Message()
+ << "Host: " << test.host << ", Origin: " << test.origin);
RefPtr<SecurityOrigin> origin_to_test =
SecurityOrigin::CreateFromString(test.origin);
OriginAccessEntry entry1(test.protocol, test.host,

Powered by Google App Engine
This is Rietveld 408576698