| Index: content/test/test_webkit_platform_support.cc
|
| diff --git a/content/test/test_webkit_platform_support.cc b/content/test/test_webkit_platform_support.cc
|
| index c0e3673a6d3e26b11b58e74c6620e731bef23373..c943446e888ea7f9ad19c9b0187db413eedcbc77 100644
|
| --- a/content/test/test_webkit_platform_support.cc
|
| +++ b/content/test/test_webkit_platform_support.cc
|
| @@ -12,6 +12,7 @@
|
| #include "base/path_service.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "content/public/common/content_switches.h"
|
| +#include "content/public/test/test_content_client_initializer.h"
|
| #include "content/test/mock_webclipboard_impl.h"
|
| #include "content/test/web_gesture_curve_mock.h"
|
| #include "content/test/web_layer_tree_view_impl_for_testing.h"
|
| @@ -54,6 +55,8 @@ TestWebKitPlatformSupport::TestWebKitPlatformSupport() {
|
| new base::StatsTable(base::StatsTable::TableIdentifier(), 20, 200));
|
| base::StatsTable::set_current(stats_table_.get());
|
|
|
| + content_initializer_.reset(new content::TestContentClientInitializer());
|
| +
|
| blink::initialize(this);
|
| blink::mainThreadIsolate()->SetCounterFunction(
|
| base::StatsTable::FindLocation);
|
| @@ -163,7 +166,7 @@ blink::WebData TestWebKitPlatformSupport::loadResource(const char* name) {
|
| "\x82";
|
| return blink::WebData(red_square, arraysize(red_square));
|
| }
|
| - return blink::WebData();
|
| + return BlinkPlatformImpl::loadResource(name);
|
| }
|
|
|
| blink::WebString TestWebKitPlatformSupport::queryLocalizedString(
|
|
|