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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/content_browser_test.h
===================================================================
--- content/test/content_browser_test.h (revision 147404)
+++ content/test/content_browser_test.h (working copy)
@@ -9,11 +9,10 @@
#include "content/public/test/browser_test.h"
#include "content/test/browser_test_base.h"
-class ShellMainDelegate;
namespace content {
class Shell;
-}
+class ShellMainDelegate;
class ContentBrowserTest : public BrowserTestBase {
protected:
@@ -28,12 +27,14 @@
virtual void RunTestOnMainThreadLoop() OVERRIDE;
// Returns the window for the test.
- content::Shell* shell() const { return shell_; }
+ Shell* shell() const { return shell_; }
private:
- scoped_ptr<ShellMainDelegate> shell_main_delegate_;
+ scoped_ptr<content::ShellMainDelegate> shell_main_delegate_;
- content::Shell* shell_;
+ Shell* shell_;
};
+} // namespace content
+
#endif // CONTENT_TEST_CONTENT_BROWSER_TEST_H_
« 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