Convert WebSecurityOrigin -> GURL without re-parsing the url

third_party/WebKit/Source/modules/storage/StorageNamespace.cpp

 /*
  * Copyright (C) 2009 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * 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 "modules/storage/StorageNamespace.h"
 
 #include "modules/storage/StorageArea.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/WebStorageArea.h"
 #include "public/platform/WebStorageNamespace.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
 StorageNamespace::StorageNamespace(
     std::unique_ptr<WebStorageNamespace> webStorageNamespace)
     : m_webStorageNamespace(std::move(webStorageNamespace)) {}
 
 StorageNamespace::~StorageNamespace() {}
 
 StorageArea* StorageNamespace::localStorageArea(SecurityOrigin* origin) {
   ASSERT(isMainThread());
   static WebStorageNamespace* localStorageNamespace = nullptr;
   if (!localStorageNamespace)
     localStorageNamespace = Platform::current()->createLocalStorageNamespace();
   return StorageArea::create(
-      wrapUnique(localStorageNamespace->createStorageArea(origin->toString())),
+      wrapUnique(
+          localStorageNamespace->createStorageArea(WebSecurityOrigin(origin))),

[esprehn, 2016/10/08 03:36:23]

Does WebSecurityOrigin not implicitly convert? I think you can just pass origin

[Charlie Harrison, 2016/10/09 02:40:11]

No it doesn't implicitly convert. My C++ foo isn't strong enough to know why
exactly:
"reference to type 'const blink::WebSecurityOrigin' could not bind to an lvalue
of type 'blink::SecurityOrigin *'"

We do have a non-explicit constructor that takes a PassRefPtr<SecurityOrigin>...

       LocalStorage);
 }
 
 StorageArea* StorageNamespace::storageArea(SecurityOrigin* origin) {
   return StorageArea::create(
-      wrapUnique(m_webStorageNamespace->createStorageArea(origin->toString())),
+      wrapUnique(
+          m_webStorageNamespace->createStorageArea(WebSecurityOrigin(origin))),
       SessionStorage);
 }
 
 bool StorageNamespace::isSameNamespace(
     const WebStorageNamespace& sessionNamespace) const {
   return m_webStorageNamespace &&
          m_webStorageNamespace->isSameNamespace(sessionNamespace);
 }
 
 }  // namespace blink