Replace setIndexedDBClientCreateFunction madness with Supplements

third_party/WebKit/Source/web/IndexedDBClientImpl.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 12 matching lines @@
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "web/IndexedDBClientImpl.h"
 
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "core/dom/Document.h"
+#include "core/dom/ExecutionContext.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/web/WebContentSettingsClient.h"
 #include "public/web/WebKit.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WorkerContentSettingsClient.h"
 
 namespace blink {
 
 IndexedDBClient* IndexedDBClientImpl::create()
 {
     return new IndexedDBClientImpl();
 }
 
 bool IndexedDBClientImpl::allowIndexedDB(ExecutionContext* context, const String& name)
 {
+    DCHECK(context->isContextThread());
     ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument() || context->isWorkerGlobalScope());
 
     if (context->isDocument()) {
         WebSecurityOrigin origin(context->getSecurityOrigin());
         Document* document = toDocument(context);
         WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(document->frame());
-        // FIXME: webFrame->contentSettingsClient() returns 0 in test_shell and content_shell http://crbug.com/137269
-        return !webFrame->contentSettingsClient() || webFrame->contentSettingsClient()->allowIndexedDB(name, origin);
+        if (!webFrame)
+            return false;
+        if (webFrame->contentSettingsClient())
+            return webFrame->contentSettingsClient()->allowIndexedDB(name, origin);
+        return true;
     }
 
     WorkerGlobalScope& workerGlobalScope = *toWorkerGlobalScope(context);
     return WorkerContentSettingsClient::from(workerGlobalScope)->allowIndexedDB(name);
 }
 
 } // namespace blink