| 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/string_util.h" |
| 11 #include "base/test/test_file_util.h" | 11 #include "base/test/test_file_util.h" |
| 12 #include "base/test/test_timeouts.h" | 12 #include "base/test/test_timeouts.h" |
| 13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 14 #include "chrome/common/chrome_paths.h" | 14 #include "chrome/common/chrome_paths.h" |
| 15 #include "chrome/test/automation/tab_proxy.h" | 15 #include "chrome/test/automation/tab_proxy.h" |
| 16 #include "net/base/escape.h" | 16 #include "net/base/escape.h" |
| 17 #include "net/base/net_util.h" | 17 #include "net/base/net_util.h" |
| 18 | 18 |
| 19 #if defined(OS_WIN) | 19 #if defined(OS_WIN) |
| 20 static const char kPlatformName[] = "chromium-win"; | 20 static const char kPlatformName[] = "chromium-win"; |
| 21 #elif defined(OS_MACOSX) | 21 #elif defined(OS_MACOSX) |
| 22 static const char kPlatformName[] = "chromium-mac"; | 22 static const char kPlatformName[] = "chromium-mac"; |
| 23 #elif defined(OS_LINUX) | 23 #elif defined(OS_LINUX) |
| 24 static const char kPlatformName[] = "chromium-linux"; | 24 static const char kPlatformName[] = "chromium-linux"; |
| 25 #elif defined(OS_OPENBSD) |
| 26 static const char kPlatformName[] = "chromium-openbsd"; |
| 25 #else | 27 #else |
| 26 #error No known OS defined | 28 #error No known OS defined |
| 27 #endif | 29 #endif |
| 28 | 30 |
| 29 static const char kTestCompleteCookie[] = "status"; | 31 static const char kTestCompleteCookie[] = "status"; |
| 30 | 32 |
| 31 UILayoutTest::UILayoutTest() | 33 UILayoutTest::UILayoutTest() |
| 32 : initialized_for_layout_test_(false), | 34 : initialized_for_layout_test_(false), |
| 33 test_count_(0) { | 35 test_count_(0) { |
| 34 } | 36 } |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 std::string* expected_result_value) { | 275 std::string* expected_result_value) { |
| 274 FilePath expected_result_path(result_dir_path); | 276 FilePath expected_result_path(result_dir_path); |
| 275 expected_result_path = expected_result_path.AppendASCII(test_case_file_name); | 277 expected_result_path = expected_result_path.AppendASCII(test_case_file_name); |
| 276 expected_result_path = expected_result_path.InsertBeforeExtension( | 278 expected_result_path = expected_result_path.InsertBeforeExtension( |
| 277 FILE_PATH_LITERAL("-expected")); | 279 FILE_PATH_LITERAL("-expected")); |
| 278 expected_result_path = | 280 expected_result_path = |
| 279 expected_result_path.ReplaceExtension(FILE_PATH_LITERAL("txt")); | 281 expected_result_path.ReplaceExtension(FILE_PATH_LITERAL("txt")); |
| 280 return file_util::ReadFileToString(expected_result_path, | 282 return file_util::ReadFileToString(expected_result_path, |
| 281 expected_result_value); | 283 expected_result_value); |
| 282 } | 284 } |
| OLD | NEW |