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

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

Issue 151023002: Move the rest of webkit/glue into content/common (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm webkit_glue.gyp Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « content/test/test_webkit_platform_support.h ('k') | content/utility/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 16 matching lines...) Expand all
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/WebScriptController.h" 31 #include "third_party/WebKit/public/web/WebScriptController.h"
32 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" 32 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
33 #include "third_party/WebKit/public/web/WebStorageEventDispatcher.h" 33 #include "third_party/WebKit/public/web/WebStorageEventDispatcher.h"
34 #include "v8/include/v8.h" 34 #include "v8/include/v8.h"
35 #include "webkit/browser/database/vfs_backend.h" 35 #include "webkit/browser/database/vfs_backend.h"
36 #include "webkit/child/webkitplatformsupport_impl.h" 36 #include "webkit/child/webkitplatformsupport_impl.h"
37 #include "webkit/glue/simple_webmimeregistry_impl.h"
38 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h" 37 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
39 38
40 #if defined(OS_WIN) 39 #if defined(OS_WIN)
41 #include "third_party/WebKit/public/platform/win/WebThemeEngine.h" 40 #include "third_party/WebKit/public/platform/win/WebThemeEngine.h"
42 #elif defined(OS_MACOSX) 41 #elif defined(OS_MACOSX)
43 #include "base/mac/mac_util.h" 42 #include "base/mac/mac_util.h"
44 #endif 43 #endif
45 44
46 using blink::WebScriptController; 45 using blink::WebScriptController;
47 using webkit::WebLayerTreeViewImplForTesting; 46 using webkit::WebLayerTreeViewImplForTesting;
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 const blink::WebString& path) { 317 const blink::WebString& path) {
319 base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path); 318 base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path);
320 319
321 std::string buffer; 320 std::string buffer;
322 base::ReadFileToString(file_path, &buffer); 321 base::ReadFileToString(file_path, &buffer);
323 322
324 return blink::WebData(buffer.data(), buffer.size()); 323 return blink::WebData(buffer.data(), buffer.size());
325 } 324 }
326 325
327 } // namespace content 326 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_webkit_platform_support.h ('k') | content/utility/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698