| 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 "webkit/support/test_webkit_platform_support.h" | 5 #include "webkit/support/test_webkit_platform_support.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 TestViewType type) { | 307 TestViewType type) { |
| 308 DCHECK_EQ(TestViewTypeUnitTest, type); | 308 DCHECK_EQ(TestViewTypeUnitTest, type); |
| 309 return createLayerTreeViewForTesting(); | 309 return createLayerTreeViewForTesting(); |
| 310 } | 310 } |
| 311 | 311 |
| 312 WebKit::WebData TestWebKitPlatformSupport::readFromFile( | 312 WebKit::WebData TestWebKitPlatformSupport::readFromFile( |
| 313 const WebKit::WebString& path) { | 313 const WebKit::WebString& path) { |
| 314 base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path); | 314 base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path); |
| 315 | 315 |
| 316 std::string buffer; | 316 std::string buffer; |
| 317 file_util::ReadFileToString(file_path, &buffer); | 317 base::ReadFileToString(file_path, &buffer); |
| 318 | 318 |
| 319 return WebKit::WebData(buffer.data(), buffer.size()); | 319 return WebKit::WebData(buffer.data(), buffer.size()); |
| 320 } | 320 } |
| OLD | NEW |