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

Unified Diff: third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

Issue 2970833002: Be explicit about namespace testing to not mix it with blink::testing (Closed)
Patch Set: 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/core/loader/FrameFetchContextTest.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
index 3cb1cccf451056df3ca1587f6d92ad0c69739812..730549d2974e684bfbbf06673d7b6475b79da396 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
@@ -60,7 +60,7 @@
namespace blink {
-using Checkpoint = testing::StrictMock<testing::MockFunction<void(int)>>;
+using Checkpoint = ::testing::StrictMock<testing::MockFunction<void(int)>>;
class StubLocalFrameClientWithParent final : public EmptyLocalFrameClient {
public:
@@ -214,7 +214,7 @@ class FrameFetchContextMockedLocalFrameClientTest
void SetUp() override {
url = KURL(NullURL(), "https://example.test/foo");
main_resource_url = KURL(NullURL(), "https://www.example.test");
- client = new testing::NiceMock<MockLocalFrameClient>();
+ client = new ::testing::NiceMock<MockLocalFrameClient>();
dummy_page_holder =
DummyPageHolder::Create(IntSize(500, 500), nullptr, client);
dummy_page_holder->GetPage().SetDeviceScaleFactorDeprecated(1.0);
@@ -901,12 +901,12 @@ TEST_F(FrameFetchContextMockedLocalFrameClientTest,
Resource* resource = MockResource::Create(resource_request);
EXPECT_CALL(*client,
DispatchDidLoadResourceFromMemoryCache(
- testing::AllOf(
- testing::Property(&ResourceRequest::Url, url),
- testing::Property(&ResourceRequest::GetFrameType,
- WebURLRequest::kFrameTypeNone),
- testing::Property(&ResourceRequest::GetRequestContext,
- WebURLRequest::kRequestContextImage)),
+ ::testing::AllOf(
+ ::testing::Property(&ResourceRequest::Url, url),
+ ::testing::Property(&ResourceRequest::GetFrameType,
+ WebURLRequest::kFrameTypeNone),
+ ::testing::Property(&ResourceRequest::GetRequestContext,
+ WebURLRequest::kRequestContextImage)),
ResourceResponse()));
fetch_context->DispatchDidLoadResourceFromMemoryCache(
CreateUniqueIdentifier(), resource_request, resource->GetResponse());

Powered by Google App Engine
This is Rietveld 408576698