| 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 "content/test/content_browser_test.h" | 7 #include "content/test/content_browser_test.h" |
| 8 | 8 |
| 9 class GURL; | 9 class GURL; |
| 10 class LayoutTestHttpServer; | 10 class LayoutTestHttpServer; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 // have been used. | 33 // have been used. |
| 34 void RunHttpLayoutTest(const std::string& test_case_file_name); | 34 void RunHttpLayoutTest(const std::string& test_case_file_name); |
| 35 void AddResourceForLayoutTest(const FilePath& parent_dir, | 35 void AddResourceForLayoutTest(const FilePath& parent_dir, |
| 36 const FilePath& resource_name); | 36 const FilePath& resource_name); |
| 37 | 37 |
| 38 private: | 38 private: |
| 39 void RunLayoutTestInternal(const std::string& test_case_file_name, | 39 void RunLayoutTestInternal(const std::string& test_case_file_name, |
| 40 const GURL& url); | 40 const GURL& url); |
| 41 void WriteModifiedFile(const std::string& test_case_file_name, | 41 void WriteModifiedFile(const std::string& test_case_file_name, |
| 42 FilePath* test_path); | 42 FilePath* test_path); |
| 43 std::string SaveResults(const std::string& expected, |
| 44 const std::string& actual); |
| 43 | 45 |
| 44 FilePath our_original_layout_test_dir_; | 46 FilePath our_original_layout_test_dir_; |
| 45 FilePath test_parent_dir_; | 47 FilePath test_parent_dir_; |
| 46 FilePath test_case_dir_; | 48 FilePath test_case_dir_; |
| 47 FilePath our_layout_test_temp_dir_; | 49 FilePath our_layout_test_temp_dir_; |
| 48 FilePath rebase_result_dir_; | 50 FilePath rebase_result_dir_; |
| 49 FilePath rebase_result_chromium_dir_; | 51 FilePath rebase_result_chromium_dir_; |
| 50 FilePath rebase_result_win_dir_; | 52 FilePath rebase_result_win_dir_; |
| 51 ScopedTempDir scoped_temp_dir_; | 53 ScopedTempDir scoped_temp_dir_; |
| 52 int port_; // -2 means no port. -1 means random. | 54 int port_; // -2 means no port. -1 means random. |
| 53 scoped_ptr<LayoutTestHttpServer> test_http_server_; | 55 scoped_ptr<LayoutTestHttpServer> test_http_server_; |
| 54 | 56 |
| 55 DISALLOW_COPY_AND_ASSIGN(InProcessBrowserLayoutTest); | 57 DISALLOW_COPY_AND_ASSIGN(InProcessBrowserLayoutTest); |
| 56 }; | 58 }; |
| OLD | NEW |