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

Side by Side Diff: third_party/WebKit/Source/core/page/scrolling/RootScrollerTest.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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "bindings/core/v8/NodeOrString.h" 5 #include "bindings/core/v8/NodeOrString.h"
6 #include "core/dom/ClientRect.h" 6 #include "core/dom/ClientRect.h"
7 #include "core/exported/WebRemoteFrameImpl.h" 7 #include "core/exported/WebRemoteFrameImpl.h"
8 #include "core/frame/BrowserControls.h" 8 #include "core/frame/BrowserControls.h"
9 #include "core/frame/FrameTestHelpers.h" 9 #include "core/frame/FrameTestHelpers.h"
10 #include "core/frame/LocalFrameView.h" 10 #include "core/frame/LocalFrameView.h"
(...skipping 18 matching lines...) Expand all
29 #include "public/platform/WebCoalescedInputEvent.h" 29 #include "public/platform/WebCoalescedInputEvent.h"
30 #include "public/platform/WebURLLoaderMockFactory.h" 30 #include "public/platform/WebURLLoaderMockFactory.h"
31 #include "public/web/WebConsoleMessage.h" 31 #include "public/web/WebConsoleMessage.h"
32 #include "public/web/WebHitTestResult.h" 32 #include "public/web/WebHitTestResult.h"
33 #include "public/web/WebRemoteFrame.h" 33 #include "public/web/WebRemoteFrame.h"
34 #include "public/web/WebScriptSource.h" 34 #include "public/web/WebScriptSource.h"
35 #include "public/web/WebSettings.h" 35 #include "public/web/WebSettings.h"
36 #include "testing/gtest/include/gtest/gtest.h" 36 #include "testing/gtest/include/gtest/gtest.h"
37 37
38 using blink::testing::RunPendingTasks; 38 using blink::testing::RunPendingTasks;
39 using testing::Mock; 39 using ::testing::Mock;
40 40
41 namespace blink { 41 namespace blink {
42 42
43 namespace { 43 namespace {
44 44
45 class RootScrollerTest : public ::testing::Test, 45 class RootScrollerTest : public ::testing::Test,
46 public ::testing::WithParamInterface<bool>, 46 public ::testing::WithParamInterface<bool>,
47 private ScopedRootLayerScrollingForTest { 47 private ScopedRootLayerScrollingForTest {
48 public: 48 public:
49 RootScrollerTest() 49 RootScrollerTest()
(...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1254 // Ensure the target and container weren't put into the same layer. 1254 // Ensure the target and container weren't put into the same layer.
1255 ASSERT_NE(ToLayoutBox(target->GetLayoutObject())->EnclosingLayer(), 1255 ASSERT_NE(ToLayoutBox(target->GetLayoutObject())->EnclosingLayer(),
1256 ToLayoutBox(container->GetLayoutObject())->Layer()); 1256 ToLayoutBox(container->GetLayoutObject())->Layer());
1257 1257
1258 CheckHitTestAtBottomOfScreen(); 1258 CheckHitTestAtBottomOfScreen();
1259 } 1259 }
1260 1260
1261 } // namespace 1261 } // namespace
1262 1262
1263 } // namespace blink 1263 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698