OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ | 5 #ifndef CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ |
6 #define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ | 6 #define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
11 #include "base/test/unit_test.h" | |
11 #include "content/public/browser/render_view_host.h" | 12 #include "content/public/browser/render_view_host.h" |
12 #include "content/public/common/page_transition_types.h" | 13 #include "content/public/common/page_transition_types.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | |
14 | 14 |
15 #if defined(USE_AURA) | 15 #if defined(USE_AURA) |
16 #include "ui/aura/test/aura_test_helper.h" | 16 #include "ui/aura/test/aura_test_helper.h" |
17 #endif | 17 #endif |
18 | 18 |
19 namespace aura { | 19 namespace aura { |
20 namespace test { | 20 namespace test { |
21 class AuraTestHelper; | 21 class AuraTestHelper; |
22 } | 22 } |
23 } | 23 } |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
111 | 111 |
112 private: | 112 private: |
113 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestEnabler); | 113 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestEnabler); |
114 friend class RenderViewHostTestHarness; | 114 friend class RenderViewHostTestHarness; |
115 | 115 |
116 scoped_ptr<MockRenderProcessHostFactory> rph_factory_; | 116 scoped_ptr<MockRenderProcessHostFactory> rph_factory_; |
117 scoped_ptr<TestRenderViewHostFactory> rvh_factory_; | 117 scoped_ptr<TestRenderViewHostFactory> rvh_factory_; |
118 }; | 118 }; |
119 | 119 |
120 // RenderViewHostTestHarness --------------------------------------------------- | 120 // RenderViewHostTestHarness --------------------------------------------------- |
121 class RenderViewHostTestHarness : public testing::Test { | 121 class RenderViewHostTestHarness : public base::UnitTest { |
Scott Byer
2012/06/18 23:45:57
This is the test harness that surrounds both the n
| |
122 public: | 122 public: |
123 RenderViewHostTestHarness(); | 123 RenderViewHostTestHarness(); |
124 virtual ~RenderViewHostTestHarness(); | 124 virtual ~RenderViewHostTestHarness(); |
125 | 125 |
126 NavigationController& controller(); | 126 NavigationController& controller(); |
127 virtual WebContents* web_contents(); | 127 virtual WebContents* web_contents(); |
128 RenderViewHost* rvh(); | 128 RenderViewHost* rvh(); |
129 RenderViewHost* pending_rvh(); | 129 RenderViewHost* pending_rvh(); |
130 RenderViewHost* active_rvh(); | 130 RenderViewHost* active_rvh(); |
131 BrowserContext* browser_context(); | 131 BrowserContext* browser_context(); |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
178 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; | 178 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; |
179 #endif | 179 #endif |
180 RenderViewHostTestEnabler rvh_test_enabler_; | 180 RenderViewHostTestEnabler rvh_test_enabler_; |
181 | 181 |
182 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness); | 182 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness); |
183 }; | 183 }; |
184 | 184 |
185 } // namespace content | 185 } // namespace content |
186 | 186 |
187 #endif // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ | 187 #endif // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_ |
OLD | NEW |