Fix effective Origin URLs for IDB + Cache for file:/// pages

content/child/storage_util.cc

Index: content/child/storage_util.cc
diff --git a/content/child/storage_util.cc b/content/child/storage_util.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6e440bf96e82347bfd2a961d01d4fef1fe736ee1
--- /dev/null
+++ b/content/child/storage_util.cc
@@ -0,0 +1,26 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/child/storage_util.h"
+
+#include "third_party/WebKit/public/platform/URLConversion.h"
+#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
+#include "url/gurl.h"
+
+namespace content {
+
+GURL WebSecurityOriginToGURL(const blink::WebSecurityOrigin& security_origin) {
+  // "file:///" URLs navigated to by the user may have "isLocal" set,
+  // which stringify as "null" by default. Previous code that sent
+  // origins from Blink to Chromium via DatabaseIdentifier would ignore
+  // this, so we mimic that behavior here.
+  // TODO(jsbell): Eliminate this. https://crbug.com/591482
+  if (security_origin.protocol().utf8() == "file" &&
+      security_origin.host().utf8() == "" && security_origin.port() == 0) {
+    return GURL("file:///");
+  }
+  return blink::WebStringToGURL(security_origin.toString());
+}
+
+}  // namespace content