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

Side by Side Diff: third_party/WebKit/Source/platform/testing/CompositorTest.h

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 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 #ifndef CompositorTest_h 5 #ifndef CompositorTest_h
6 #define CompositorTest_h 6 #define CompositorTest_h
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/test/test_mock_time_task_runner.h" 9 #include "base/test/test_mock_time_task_runner.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
11 #include "platform/wtf/Noncopyable.h" 11 #include "platform/wtf/Noncopyable.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 namespace blink { 14 namespace blink {
15 15
16 class CompositorTest : public testing::Test { 16 class CompositorTest : public ::testing::Test {
17 WTF_MAKE_NONCOPYABLE(CompositorTest); 17 WTF_MAKE_NONCOPYABLE(CompositorTest);
18 18
19 public: 19 public:
20 CompositorTest(); 20 CompositorTest();
21 virtual ~CompositorTest(); 21 virtual ~CompositorTest();
22 22
23 protected: 23 protected:
24 // Mock task runner is initialized here because tests create 24 // Mock task runner is initialized here because tests create
25 // WebLayerTreeViewImplForTesting which needs the current task runner handle. 25 // WebLayerTreeViewImplForTesting which needs the current task runner handle.
26 scoped_refptr<base::TestMockTimeTaskRunner> runner_; 26 scoped_refptr<base::TestMockTimeTaskRunner> runner_;
27 base::ThreadTaskRunnerHandle runner_handle_; 27 base::ThreadTaskRunnerHandle runner_handle_;
28 }; 28 };
29 29
30 } // namespace blink 30 } // namespace blink
31 31
32 #endif // CompositorTest_h 32 #endif // CompositorTest_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698