Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Side by Side Diff: content/test/test_webkit_platform_support.cc

Issue 317163002: Moving compositor_bindings from webkit to content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changing dependencies due to failing ios bots Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/test/test_webkit_platform_support.h" 5 #include "content/test/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 14 matching lines...) Expand all
25 #include "third_party/WebKit/public/platform/WebStorageNamespace.h" 25 #include "third_party/WebKit/public/platform/WebStorageNamespace.h"
26 #include "third_party/WebKit/public/platform/WebString.h" 26 #include "third_party/WebKit/public/platform/WebString.h"
27 #include "third_party/WebKit/public/platform/WebURL.h" 27 #include "third_party/WebKit/public/platform/WebURL.h"
28 #include "third_party/WebKit/public/web/WebDatabase.h" 28 #include "third_party/WebKit/public/web/WebDatabase.h"
29 #include "third_party/WebKit/public/web/WebKit.h" 29 #include "third_party/WebKit/public/web/WebKit.h"
30 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 30 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
31 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" 31 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
32 #include "third_party/WebKit/public/web/WebStorageEventDispatcher.h" 32 #include "third_party/WebKit/public/web/WebStorageEventDispatcher.h"
33 #include "v8/include/v8.h" 33 #include "v8/include/v8.h"
34 #include "webkit/browser/database/vfs_backend.h" 34 #include "webkit/browser/database/vfs_backend.h"
35 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
36 35
37 #if defined(OS_MACOSX) 36 #if defined(OS_MACOSX)
38 #include "base/mac/mac_util.h" 37 #include "base/mac/mac_util.h"
39 #endif 38 #endif
40 39
41 namespace content { 40 namespace content {
42 41
43 TestWebKitPlatformSupport::TestWebKitPlatformSupport() { 42 TestWebKitPlatformSupport::TestWebKitPlatformSupport() {
44 url_loader_factory_.reset(new WebURLLoaderMockFactory()); 43 url_loader_factory_.reset(new WebURLLoaderMockFactory());
45 mock_clipboard_.reset(new MockWebClipboardImpl()); 44 mock_clipboard_.reset(new MockWebClipboardImpl());
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 const blink::WebString& path) { 276 const blink::WebString& path) {
278 base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path); 277 base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path);
279 278
280 std::string buffer; 279 std::string buffer;
281 base::ReadFileToString(file_path, &buffer); 280 base::ReadFileToString(file_path, &buffer);
282 281
283 return blink::WebData(buffer.data(), buffer.size()); 282 return blink::WebData(buffer.data(), buffer.size());
284 } 283 }
285 284
286 } // namespace content 285 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_webkit_platform_support.h ('k') | content/test/web_layer_tree_view_impl_for_testing.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698