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

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrameViewTest.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/frame/LocalFrameViewTest.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrameViewTest.cpp b/third_party/WebKit/Source/core/frame/LocalFrameViewTest.cpp
index 3a7bf59cf0932e8bac0f25818bb3dba197c60f94..a703ec3e264547c4eb4380cb35d55fef52af631f 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrameViewTest.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrameViewTest.cpp
@@ -23,8 +23,8 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-using testing::_;
-using testing::AnyNumber;
+using ::testing::_;
+using ::testing::AnyNumber;
namespace blink {
namespace {
@@ -51,9 +51,9 @@ class MockChromeClient : public EmptyChromeClient {
typedef bool TestParamRootLayerScrolling;
class LocalFrameViewTest
- : public testing::WithParamInterface<TestParamRootLayerScrolling>,
+ : public ::testing::WithParamInterface<TestParamRootLayerScrolling>,
private ScopedRootLayerScrollingForTest,
- public testing::Test {
+ public ::testing::Test {
protected:
LocalFrameViewTest()
: ScopedRootLayerScrollingForTest(GetParam()),
@@ -63,7 +63,7 @@ class LocalFrameViewTest
}
~LocalFrameViewTest() {
- testing::Mock::VerifyAndClearExpectations(&ChromeClient());
+ ::testing::Mock::VerifyAndClearExpectations(&ChromeClient());
}
void SetUp() override {
« no previous file with comments | « third_party/WebKit/Source/core/frame/DOMTimerTest.cpp ('k') | third_party/WebKit/Source/core/html/HTMLEmbedElementTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698