summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authorpilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-15 08:20:27 +0000
committerpilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-15 08:20:27 +0000
commit89700f661c02975ecbcadc1615ad17c4ff753076 (patch)
treee55931c60efeb01d57af2582cd58cfcdbe5dedc3 /webkit/support
parent029a771393c2f13579ea342c608b1401beae0523 (diff)
downloadchromium_src-89700f661c02975ecbcadc1615ad17c4ff753076.zip
chromium_src-89700f661c02975ecbcadc1615ad17c4ff753076.tar.gz
chromium_src-89700f661c02975ecbcadc1615ad17c4ff753076.tar.bz2
Explicitly initialize the IDB Factory after resetting webkit_platform_support, because upstream WebKit will soon require all embedders to do this.
Review URL: https://chromiumcodereview.appspot.com/11878023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
-rw-r--r--webkit/support/webkit_support.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index b2a3d55..5ddfc0f 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -38,6 +38,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h"
@@ -170,6 +171,8 @@ class TestEnvironment {
webkit_platform_support_.reset(
new TestWebKitPlatformSupport(unit_test_mode,
shadow_platform_delegate));
+ WebKit::setIDBFactory(
+ webkit_platform_support_.get()->idbFactory());
#if defined(OS_ANDROID)
// Make sure we have enough decoding resources for layout tests.