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

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

Issue 11346016: Move remaining content test code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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/test/content_test_launcher.cc ('k') | content/test/layout_browsertest.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 #include "base/file_path.h" 5 #include "base/file_path.h"
6 #include "base/scoped_temp_dir.h" 6 #include "base/scoped_temp_dir.h"
7 #include "content/test/content_browser_test.h" 7 #include "content/test/content_browser_test.h"
8 8
9 class GURL; 9 class GURL;
10 namespace content {
10 class LayoutTestHttpServer; 11 class LayoutTestHttpServer;
11 namespace content {
12 class WebKitTestController; 12 class WebKitTestController;
13 }
14 13
15 class InProcessBrowserLayoutTest : public content::ContentBrowserTest { 14 class InProcessBrowserLayoutTest : public ContentBrowserTest {
16 public: 15 public:
17 explicit InProcessBrowserLayoutTest(const FilePath& test_parent_dir, 16 explicit InProcessBrowserLayoutTest(const FilePath& test_parent_dir,
18 const FilePath& test_case_dir); 17 const FilePath& test_case_dir);
19 // Used when running HTTP layout tests. Starts the server in the constructor 18 // Used when running HTTP layout tests. Starts the server in the constructor
20 // and keeps it running through the lifetime of this test. This is done to 19 // and keeps it running through the lifetime of this test. This is done to
21 // avoid flakiness in restarting the server while the port is still in use. 20 // avoid flakiness in restarting the server while the port is still in use.
22 // If -1 is passed for |port|, a random number will be used. This is 21 // If -1 is passed for |port|, a random number will be used. This is
23 // recommended when possible, in case multiple tests are running at the same 22 // recommended when possible, in case multiple tests are running at the same
24 // time. For some tests this isn't possible though, because they use resources 23 // time. For some tests this isn't possible though, because they use resources
25 // that hardcode a specific port. 24 // that hardcode a specific port.
(...skipping 20 matching lines...) Expand all
46 45
47 FilePath layout_test_dir_; 46 FilePath layout_test_dir_;
48 FilePath test_parent_dir_; 47 FilePath test_parent_dir_;
49 FilePath test_case_dir_; 48 FilePath test_case_dir_;
50 FilePath rebase_result_dir_; 49 FilePath rebase_result_dir_;
51 FilePath rebase_result_chromium_dir_; 50 FilePath rebase_result_chromium_dir_;
52 FilePath rebase_result_win_dir_; 51 FilePath rebase_result_win_dir_;
53 int port_; // -2 means no port. -1 means random. 52 int port_; // -2 means no port. -1 means random.
54 scoped_ptr<LayoutTestHttpServer> test_http_server_; 53 scoped_ptr<LayoutTestHttpServer> test_http_server_;
55 54
56 scoped_ptr<content::WebKitTestController> test_controller_; 55 scoped_ptr<WebKitTestController> test_controller_;
57 56
58 DISALLOW_COPY_AND_ASSIGN(InProcessBrowserLayoutTest); 57 DISALLOW_COPY_AND_ASSIGN(InProcessBrowserLayoutTest);
59 }; 58 };
59
60 } // namespace content
OLDNEW
« no previous file with comments | « content/test/content_test_launcher.cc ('k') | content/test/layout_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698