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

Side by Side Diff: content/test/content_browser_test.h

Issue 10820043: Convert speech and session history browser_tests to run under content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « content/shell/shell.h ('k') | content/test/content_browser_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_TEST_CONTENT_BROWSER_TEST_H_ 5 #ifndef CONTENT_TEST_CONTENT_BROWSER_TEST_H_
6 #define CONTENT_TEST_CONTENT_BROWSER_TEST_H_ 6 #define CONTENT_TEST_CONTENT_BROWSER_TEST_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/public/test/browser_test.h" 9 #include "content/public/test/browser_test.h"
10 #include "content/test/browser_test_base.h" 10 #include "content/test/browser_test_base.h"
11 11
12 class GURL; 12 class GURL;
13 13
14 namespace content { 14 namespace content {
15 class ContentRendererClient;
15 class Shell; 16 class Shell;
16 class ShellMainDelegate; 17 class ShellMainDelegate;
17 18
18 class ContentBrowserTest : public BrowserTestBase { 19 class ContentBrowserTest : public BrowserTestBase {
19 protected: 20 protected:
20 ContentBrowserTest(); 21 ContentBrowserTest();
21 virtual ~ContentBrowserTest(); 22 virtual ~ContentBrowserTest();
22 23
23 // testing::Test: 24 // testing::Test:
24 virtual void SetUp() OVERRIDE; 25 virtual void SetUp() OVERRIDE;
25 virtual void TearDown() OVERRIDE; 26 virtual void TearDown() OVERRIDE;
26 27
27 // BrowserTestBase: 28 // BrowserTestBase:
28 virtual void RunTestOnMainThreadLoop() OVERRIDE; 29 virtual void RunTestOnMainThreadLoop() OVERRIDE;
29 30
30 protected: 31 protected:
31 // Creates a new window and loads about:blank. 32 // Creates a new window and loads about:blank.
32 Shell* CreateBrowser(); 33 Shell* CreateBrowser();
33 34
34 // Creates an off-the-record window and loads about:blank. 35 // Creates an off-the-record window and loads about:blank.
35 Shell* CreateOffTheRecordBrowser(); 36 Shell* CreateOffTheRecordBrowser();
36 37
37 // Returns the window for the test. 38 // Returns the window for the test.
38 Shell* shell() const { return shell_; } 39 Shell* shell() const { return shell_; }
39 40
40 private: 41 private:
41 scoped_ptr<content::ShellMainDelegate> shell_main_delegate_; 42 scoped_ptr<content::ShellMainDelegate> shell_main_delegate_;
42 43
43 Shell* shell_; 44 Shell* shell_;
45
46 // ContentRendererClient when running in single-process mode.
47 scoped_ptr<ContentRendererClient> single_process_renderer_client_;
44 }; 48 };
45 49
46 } // namespace content 50 } // namespace content
47 51
48 #endif // CONTENT_TEST_CONTENT_BROWSER_TEST_H_ 52 #endif // CONTENT_TEST_CONTENT_BROWSER_TEST_H_
OLDNEW
« no previous file with comments | « content/shell/shell.h ('k') | content/test/content_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698