| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 LOG(WARNING) << "Failed to create a temp dir for the filesystem." | 89 LOG(WARNING) << "Failed to create a temp dir for the filesystem." |
| 90 "FileSystem feature will be disabled."; | 90 "FileSystem feature will be disabled."; |
| 91 DCHECK(file_system_root_.path().empty()); | 91 DCHECK(file_system_root_.path().empty()); |
| 92 } | 92 } |
| 93 | 93 |
| 94 #if defined(OS_WIN) | 94 #if defined(OS_WIN) |
| 95 // Ensure we pick up the default theme engine. | 95 // Ensure we pick up the default theme engine. |
| 96 SetThemeEngine(NULL); | 96 SetThemeEngine(NULL); |
| 97 #endif | 97 #endif |
| 98 | 98 |
| 99 net::CookieMonster::EnableFileScheme(); | |
| 100 | |
| 101 // Test shell always exposes the GC. | 99 // Test shell always exposes the GC. |
| 102 webkit_glue::SetJavaScriptFlags(" --expose-gc"); | 100 webkit_glue::SetJavaScriptFlags(" --expose-gc"); |
| 103 } | 101 } |
| 104 | 102 |
| 105 TestWebKitPlatformSupport::~TestWebKitPlatformSupport() { | 103 TestWebKitPlatformSupport::~TestWebKitPlatformSupport() { |
| 106 } | 104 } |
| 107 | 105 |
| 108 WebKit::WebMimeRegistry* TestWebKitPlatformSupport::mimeRegistry() { | 106 WebKit::WebMimeRegistry* TestWebKitPlatformSupport::mimeRegistry() { |
| 109 return &mime_registry_; | 107 return &mime_registry_; |
| 110 } | 108 } |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 | 309 |
| 312 WebKit::WebData TestWebKitPlatformSupport::readFromFile( | 310 WebKit::WebData TestWebKitPlatformSupport::readFromFile( |
| 313 const WebKit::WebString& path) { | 311 const WebKit::WebString& path) { |
| 314 base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path); | 312 base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path); |
| 315 | 313 |
| 316 std::string buffer; | 314 std::string buffer; |
| 317 file_util::ReadFileToString(file_path, &buffer); | 315 file_util::ReadFileToString(file_path, &buffer); |
| 318 | 316 |
| 319 return WebKit::WebData(buffer.data(), buffer.size()); | 317 return WebKit::WebData(buffer.data(), buffer.size()); |
| 320 } | 318 } |
| OLD | NEW |