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

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

Issue 10809016: Move content_shell and content_browsertests code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix android Created 8 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 | Annotate | Revision Log
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 ShellMainDelegate;
13 12
14 namespace content { 13 namespace content {
15 class Shell; 14 class Shell;
16 } 15 class ShellMainDelegate;
17 16
18 class ContentBrowserTest : public BrowserTestBase { 17 class ContentBrowserTest : public BrowserTestBase {
19 protected: 18 protected:
20 ContentBrowserTest(); 19 ContentBrowserTest();
21 virtual ~ContentBrowserTest(); 20 virtual ~ContentBrowserTest();
22 21
23 // testing::Test: 22 // testing::Test:
24 virtual void SetUp() OVERRIDE; 23 virtual void SetUp() OVERRIDE;
25 virtual void TearDown() OVERRIDE; 24 virtual void TearDown() OVERRIDE;
26 25
27 // BrowserTestBase: 26 // BrowserTestBase:
28 virtual void RunTestOnMainThreadLoop() OVERRIDE; 27 virtual void RunTestOnMainThreadLoop() OVERRIDE;
29 28
30 // Returns the window for the test. 29 // Returns the window for the test.
31 content::Shell* shell() const { return shell_; } 30 Shell* shell() const { return shell_; }
32 31
33 private: 32 private:
34 scoped_ptr<ShellMainDelegate> shell_main_delegate_; 33 scoped_ptr<content::ShellMainDelegate> shell_main_delegate_;
35 34
36 content::Shell* shell_; 35 Shell* shell_;
37 }; 36 };
38 37
38 } // namespace content
39
39 #endif // CONTENT_TEST_CONTENT_BROWSER_TEST_H_ 40 #endif // CONTENT_TEST_CONTENT_BROWSER_TEST_H_
OLDNEW
« no previous file with comments | « content/shell/shell_resource_dispatcher_host_delegate.cc ('k') | content/test/content_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698