| Index: content/test/layout_browsertest.h
|
| ===================================================================
|
| --- content/test/layout_browsertest.h (revision 164732)
|
| +++ content/test/layout_browsertest.h (working copy)
|
| @@ -7,12 +7,11 @@
|
| #include "content/test/content_browser_test.h"
|
|
|
| class GURL;
|
| +namespace content {
|
| class LayoutTestHttpServer;
|
| -namespace content {
|
| class WebKitTestController;
|
| -}
|
|
|
| -class InProcessBrowserLayoutTest : public content::ContentBrowserTest {
|
| +class InProcessBrowserLayoutTest : public ContentBrowserTest {
|
| public:
|
| explicit InProcessBrowserLayoutTest(const FilePath& test_parent_dir,
|
| const FilePath& test_case_dir);
|
| @@ -53,7 +52,9 @@
|
| int port_; // -2 means no port. -1 means random.
|
| scoped_ptr<LayoutTestHttpServer> test_http_server_;
|
|
|
| - scoped_ptr<content::WebKitTestController> test_controller_;
|
| + scoped_ptr<WebKitTestController> test_controller_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(InProcessBrowserLayoutTest);
|
| };
|
| +
|
| +} // namespace content
|
|
|