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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTestHelper.h

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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef LayoutTestHelper_h 5 #ifndef LayoutTestHelper_h
6 #define LayoutTestHelper_h 6 #define LayoutTestHelper_h
7 7
8 #include <gtest/gtest.h> 8 #include <gtest/gtest.h>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // FrameClient overrides: 59 // FrameClient overrides:
60 void Detached(FrameDetachType) override; 60 void Detached(FrameDetachType) override;
61 LocalFrame* Parent() const override { return parent_.Get(); } 61 LocalFrame* Parent() const override { return parent_.Get(); }
62 62
63 private: 63 private:
64 explicit LocalFrameClientWithParent(LocalFrame* parent) : parent_(parent) {} 64 explicit LocalFrameClientWithParent(LocalFrame* parent) : parent_(parent) {}
65 65
66 Member<LocalFrame> parent_; 66 Member<LocalFrame> parent_;
67 }; 67 };
68 68
69 class RenderingTest : public testing::Test { 69 class RenderingTest : public ::testing::Test {
70 USING_FAST_MALLOC(RenderingTest); 70 USING_FAST_MALLOC(RenderingTest);
71 71
72 public: 72 public:
73 virtual FrameSettingOverrideFunction SettingOverrider() const { 73 virtual FrameSettingOverrideFunction SettingOverrider() const {
74 return nullptr; 74 return nullptr;
75 } 75 }
76 virtual ChromeClient& GetChromeClient() const; 76 virtual ChromeClient& GetChromeClient() const;
77 77
78 RenderingTest(LocalFrameClient* = nullptr); 78 RenderingTest(LocalFrameClient* = nullptr);
79 79
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 void LoadAhem(); 117 void LoadAhem();
118 118
119 private: 119 private:
120 Persistent<LocalFrameClient> local_frame_client_; 120 Persistent<LocalFrameClient> local_frame_client_;
121 std::unique_ptr<DummyPageHolder> page_holder_; 121 std::unique_ptr<DummyPageHolder> page_holder_;
122 }; 122 };
123 123
124 } // namespace blink 124 } // namespace blink
125 125
126 #endif // LayoutTestHelper_h 126 #endif // LayoutTestHelper_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698