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

Side by Side Diff: content/browser/renderer_host/test_render_view_host.h

Issue 6695029: Make ContentBrowserClient not be owned by ContentClient, so that the latter d... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "chrome/browser/chrome_content_browser_client.h"
13 #include "chrome/common/page_transition_types.h" 14 #include "chrome/common/page_transition_types.h"
14 #include "content/browser/renderer_host/mock_render_process_host.h" 15 #include "content/browser/renderer_host/mock_render_process_host.h"
15 #include "content/browser/renderer_host/render_view_host.h" 16 #include "content/browser/renderer_host/render_view_host.h"
16 #include "content/browser/renderer_host/render_view_host_factory.h" 17 #include "content/browser/renderer_host/render_view_host_factory.h"
17 #include "content/browser/renderer_host/render_widget_host_view.h" 18 #include "content/browser/renderer_host/render_widget_host_view.h"
18 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
19 20
20 namespace gfx { 21 namespace gfx {
21 class Rect; 22 class Rect;
22 } 23 }
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 // This profile will be created in SetUp if it has not already been created. 296 // This profile will be created in SetUp if it has not already been created.
296 // This allows tests to override the profile if they so choose in their own 297 // This allows tests to override the profile if they so choose in their own
297 // SetUp function before calling the base class's (us) SetUp(). 298 // SetUp function before calling the base class's (us) SetUp().
298 scoped_ptr<TestingProfile> profile_; 299 scoped_ptr<TestingProfile> profile_;
299 300
300 MessageLoopForUI message_loop_; 301 MessageLoopForUI message_loop_;
301 302
302 MockRenderProcessHostFactory rph_factory_; 303 MockRenderProcessHostFactory rph_factory_;
303 TestRenderViewHostFactory rvh_factory_; 304 TestRenderViewHostFactory rvh_factory_;
304 305
306 chrome::ChromeContentBrowserClient browser_client_;
305 scoped_ptr<TestTabContents> contents_; 307 scoped_ptr<TestTabContents> contents_;
306 308
307 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness); 309 DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
308 }; 310 };
309 311
310 #endif // CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_ 312 #endif // CONTENT_BROWSER_RENDERER_HOST_TEST_TEST_RENDER_VIEW_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698