| Index: content/test/test_blink_web_unit_test_support.cc
|
| diff --git a/content/test/test_blink_web_unit_test_support.cc b/content/test/test_blink_web_unit_test_support.cc
|
| index 0d5d7cf6192625e0728ac0a24d99bb2ddf2bcdc0..b05e447b0e9a46d0d5c94fd7c75cecb75a4b684c 100644
|
| --- a/content/test/test_blink_web_unit_test_support.cc
|
| +++ b/content/test/test_blink_web_unit_test_support.cc
|
| @@ -27,19 +27,12 @@
|
| #include "storage/browser/database/vfs_backend.h"
|
| #include "third_party/WebKit/public/platform/WebConnectionType.h"
|
| #include "third_party/WebKit/public/platform/WebData.h"
|
| -#include "third_party/WebKit/public/platform/WebFileSystem.h"
|
| #include "third_party/WebKit/public/platform/WebPluginListBuilder.h"
|
| -#include "third_party/WebKit/public/platform/WebStorageArea.h"
|
| -#include "third_party/WebKit/public/platform/WebStorageNamespace.h"
|
| #include "third_party/WebKit/public/platform/WebString.h"
|
| #include "third_party/WebKit/public/platform/WebURL.h"
|
| -#include "third_party/WebKit/public/web/WebCache.h"
|
| -#include "third_party/WebKit/public/web/WebDatabase.h"
|
| #include "third_party/WebKit/public/web/WebKit.h"
|
| #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h"
|
| #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
|
| -#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
|
| -#include "third_party/WebKit/public/web/WebStorageEventDispatcher.h"
|
| #include "v8/include/v8.h"
|
|
|
| #if defined(OS_MACOSX)
|
| @@ -300,41 +293,9 @@ blink::WebGestureCurve* TestBlinkWebUnitTestSupport::createFlingAnimationCurve(
|
| return new WebGestureCurveMock(velocity, cumulative_scroll);
|
| }
|
|
|
| -blink::WebUnitTestSupport* TestBlinkWebUnitTestSupport::unitTestSupport() {
|
| - return this;
|
| -}
|
| -
|
| -void TestBlinkWebUnitTestSupport::registerMockedURL(
|
| - const blink::WebURL& url,
|
| - const blink::WebURLResponse& response,
|
| - const blink::WebString& file_path) {
|
| - url_loader_factory_->registerURL(url, response, file_path);
|
| -}
|
| -
|
| -void TestBlinkWebUnitTestSupport::registerMockedErrorURL(
|
| - const blink::WebURL& url,
|
| - const blink::WebURLResponse& response,
|
| - const blink::WebURLError& error) {
|
| - url_loader_factory_->registerErrorURL(url, response, error);
|
| -}
|
| -
|
| -void TestBlinkWebUnitTestSupport::unregisterMockedURL(
|
| - const blink::WebURL& url) {
|
| - url_loader_factory_->unregisterURL(url);
|
| -}
|
| -
|
| -void TestBlinkWebUnitTestSupport::unregisterAllMockedURLs() {
|
| - url_loader_factory_->unregisterAllURLs();
|
| - blink::WebCache::clear();
|
| -}
|
| -
|
| -void TestBlinkWebUnitTestSupport::serveAsynchronousMockedRequests() {
|
| - url_loader_factory_->serveAsynchronousRequests();
|
| -}
|
| -
|
| -void TestBlinkWebUnitTestSupport::setLoaderDelegate(
|
| - blink::WebURLLoaderTestDelegate* delegate) {
|
| - url_loader_factory_->setLoaderDelegate(delegate);
|
| +blink::WebURLLoaderMockFactory*
|
| +TestBlinkWebUnitTestSupport::getURLLoaderMockFactory() {
|
| + return url_loader_factory_.get();
|
| }
|
|
|
| blink::WebThread* TestBlinkWebUnitTestSupport::currentThread() {
|
|
|