OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/file_util.h" | 5 #include "base/file_util.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/scoped_temp_dir.h" | 7 #include "base/scoped_temp_dir.h" |
8 #include "base/stats_counters.h" | 8 #include "base/stats_counters.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" |
10 #include "net/base/cookie_monster.h" | 11 #include "net/base/cookie_monster.h" |
11 #include "net/http/http_cache.h" | 12 #include "net/http/http_cache.h" |
12 #include "net/test/test_server.h" | 13 #include "net/test/test_server.h" |
13 #include "media/base/media.h" | 14 #include "media/base/media.h" |
14 #include "third_party/WebKit/WebKit/chromium/public/WebData.h" | 15 #include "third_party/WebKit/WebKit/chromium/public/WebData.h" |
15 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" | 16 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" |
16 #include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h" | 17 #include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h" |
17 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" | 18 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h" |
18 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" | 19 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h" |
19 #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" | 20 #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h" |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 } | 248 } |
248 #endif | 249 #endif |
249 | 250 |
250 WebKit::WebSharedWorkerRepository* TestWebKitClient::sharedWorkerRepository() { | 251 WebKit::WebSharedWorkerRepository* TestWebKitClient::sharedWorkerRepository() { |
251 return NULL; | 252 return NULL; |
252 } | 253 } |
253 | 254 |
254 WebKit::WebGraphicsContext3D* TestWebKitClient::createGraphicsContext3D() { | 255 WebKit::WebGraphicsContext3D* TestWebKitClient::createGraphicsContext3D() { |
255 return WebKit::WebGraphicsContext3D::createDefault(); | 256 return WebKit::WebGraphicsContext3D::createDefault(); |
256 } | 257 } |
OLD | NEW |