| OLD | NEW |
| 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 "chrome/test/base/in_process_browser_test.h" | 7 #include "content/test/content_browser_test.h" |
| 8 | 8 |
| 9 class GURL; |
| 9 class LayoutTestHttpServer; | 10 class LayoutTestHttpServer; |
| 10 | 11 |
| 11 class InProcessBrowserLayoutTest : public InProcessBrowserTest { | 12 class InProcessBrowserLayoutTest : public content::ContentBrowserTest { |
| 12 public: | 13 public: |
| 13 explicit InProcessBrowserLayoutTest(const FilePath& test_parent_dir, | 14 explicit InProcessBrowserLayoutTest(const FilePath& test_parent_dir, |
| 14 const FilePath& test_case_dir); | 15 const FilePath& test_case_dir); |
| 15 // Used when running HTTP layout tests. Starts the server in the constructor | 16 // Used when running HTTP layout tests. Starts the server in the constructor |
| 16 // and keeps it running through the lifetime of this test. This is done to | 17 // and keeps it running through the lifetime of this test. This is done to |
| 17 // avoid flakiness in restarting the server while the port is still in use. | 18 // avoid flakiness in restarting the server while the port is still in use. |
| 18 // If -1 is passed for |port|, a random number will be used. This is | 19 // If -1 is passed for |port|, a random number will be used. This is |
| 19 // recommended when possible, in case multiple tests are running at the same | 20 // recommended when possible, in case multiple tests are running at the same |
| 20 // time. For some tests this isn't possible though, because they use resources | 21 // time. For some tests this isn't possible though, because they use resources |
| 21 // that hardcode a specific port. | 22 // that hardcode a specific port. |
| (...skipping 24 matching lines...) Expand all Loading... |
| 46 FilePath our_layout_test_temp_dir_; | 47 FilePath our_layout_test_temp_dir_; |
| 47 FilePath rebase_result_dir_; | 48 FilePath rebase_result_dir_; |
| 48 FilePath rebase_result_chromium_dir_; | 49 FilePath rebase_result_chromium_dir_; |
| 49 FilePath rebase_result_win_dir_; | 50 FilePath rebase_result_win_dir_; |
| 50 ScopedTempDir scoped_temp_dir_; | 51 ScopedTempDir scoped_temp_dir_; |
| 51 int port_; // -2 means no port. -1 means random. | 52 int port_; // -2 means no port. -1 means random. |
| 52 scoped_ptr<LayoutTestHttpServer> test_http_server_; | 53 scoped_ptr<LayoutTestHttpServer> test_http_server_; |
| 53 | 54 |
| 54 DISALLOW_COPY_AND_ASSIGN(InProcessBrowserLayoutTest); | 55 DISALLOW_COPY_AND_ASSIGN(InProcessBrowserLayoutTest); |
| 55 }; | 56 }; |
| OLD | NEW |