| 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/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
| 10 #include "base/metrics/stats_counters.h" | 10 #include "base/metrics/stats_counters.h" |
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
| 13 #include "cc/base/thread_impl.h" | |
| 14 #include "cc/output/context_provider.h" | 13 #include "cc/output/context_provider.h" |
| 15 #include "media/base/media.h" | 14 #include "media/base/media.h" |
| 16 #include "net/cookies/cookie_monster.h" | 15 #include "net/cookies/cookie_monster.h" |
| 17 #include "net/http/http_cache.h" | 16 #include "net/http/http_cache.h" |
| 18 #include "net/test/spawned_test_server/spawned_test_server.h" | 17 #include "net/test/spawned_test_server/spawned_test_server.h" |
| 19 #include "third_party/WebKit/public/web/WebDatabase.h" | 18 #include "third_party/WebKit/public/web/WebDatabase.h" |
| 20 #include "third_party/WebKit/public/web/WebKit.h" | 19 #include "third_party/WebKit/public/web/WebKit.h" |
| 21 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" | 20 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" |
| 22 #include "third_party/WebKit/public/web/WebScriptController.h" | 21 #include "third_party/WebKit/public/web/WebScriptController.h" |
| 23 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" | 22 #include "third_party/WebKit/public/web/WebSecurityPolicy.h" |
| (...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 505 return webkit_support::GetWebKitRootDir(); | 504 return webkit_support::GetWebKitRootDir(); |
| 506 } | 505 } |
| 507 | 506 |
| 508 | 507 |
| 509 WebKit::WebLayerTreeView* | 508 WebKit::WebLayerTreeView* |
| 510 TestWebKitPlatformSupport::createLayerTreeViewForTesting() { | 509 TestWebKitPlatformSupport::createLayerTreeViewForTesting() { |
| 511 scoped_ptr<WebLayerTreeViewImplForTesting> view( | 510 scoped_ptr<WebLayerTreeViewImplForTesting> view( |
| 512 new WebLayerTreeViewImplForTesting( | 511 new WebLayerTreeViewImplForTesting( |
| 513 webkit_support::FAKE_CONTEXT, NULL)); | 512 webkit_support::FAKE_CONTEXT, NULL)); |
| 514 | 513 |
| 515 if (!view->Initialize(scoped_ptr<cc::Thread>())) | 514 if (!view->Initialize()) |
| 516 return NULL; | 515 return NULL; |
| 517 return view.release(); | 516 return view.release(); |
| 518 } | 517 } |
| 519 | 518 |
| 520 WebKit::WebLayerTreeView* | 519 WebKit::WebLayerTreeView* |
| 521 TestWebKitPlatformSupport::createLayerTreeViewForTesting( | 520 TestWebKitPlatformSupport::createLayerTreeViewForTesting( |
| 522 TestViewType type) { | 521 TestViewType type) { |
| 523 DCHECK_EQ(TestViewTypeUnitTest, type); | 522 DCHECK_EQ(TestViewTypeUnitTest, type); |
| 524 return createLayerTreeViewForTesting(); | 523 return createLayerTreeViewForTesting(); |
| 525 } | 524 } |
| 526 | 525 |
| OLD | NEW |