| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/test/ui/ui_layout_test.h" | 5 #include "chrome/test/ui/ui_layout_test.h" |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/string_util.h" |
| 10 #include "base/test/test_file_util.h" | 11 #include "base/test/test_file_util.h" |
| 11 #include "base/test/test_timeouts.h" | 12 #include "base/test/test_timeouts.h" |
| 12 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 13 #include "chrome/common/chrome_paths.h" | 14 #include "chrome/common/chrome_paths.h" |
| 14 #include "chrome/test/automation/tab_proxy.h" | 15 #include "chrome/test/automation/tab_proxy.h" |
| 15 #include "net/base/escape.h" | 16 #include "net/base/escape.h" |
| 16 #include "net/base/net_util.h" | 17 #include "net/base/net_util.h" |
| 17 | 18 |
| 18 #if defined(OS_WIN) | 19 #if defined(OS_WIN) |
| 19 static const char kPlatformName[] = "chromium-win"; | 20 static const char kPlatformName[] = "chromium-win"; |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 std::string* expected_result_value) { | 267 std::string* expected_result_value) { |
| 267 FilePath expected_result_path(result_dir_path); | 268 FilePath expected_result_path(result_dir_path); |
| 268 expected_result_path = expected_result_path.AppendASCII(test_case_file_name); | 269 expected_result_path = expected_result_path.AppendASCII(test_case_file_name); |
| 269 expected_result_path = expected_result_path.InsertBeforeExtension( | 270 expected_result_path = expected_result_path.InsertBeforeExtension( |
| 270 FILE_PATH_LITERAL("-expected")); | 271 FILE_PATH_LITERAL("-expected")); |
| 271 expected_result_path = | 272 expected_result_path = |
| 272 expected_result_path.ReplaceExtension(FILE_PATH_LITERAL("txt")); | 273 expected_result_path.ReplaceExtension(FILE_PATH_LITERAL("txt")); |
| 273 return file_util::ReadFileToString(expected_result_path, | 274 return file_util::ReadFileToString(expected_result_path, |
| 274 expected_result_value); | 275 expected_result_value); |
| 275 } | 276 } |
| OLD | NEW |