Remove Blink's DatabaseIdentifier implementation

third_party/WebKit/Source/modules/webdatabase/SQLTransactionClient.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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (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/webdatabase/SQLTransactionClient.h"
 
 #include "core/dom/CrossThreadTask.h"
 #include "core/dom/ExecutionContext.h"
 #include "modules/webdatabase/Database.h"
 #include "modules/webdatabase/DatabaseContext.h"
-#include "platform/weborigin/DatabaseIdentifier.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebDatabaseObserver.h"
+#include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/Functional.h"
 
 namespace blink {
 
-static void databaseModified(const String& originIdentifier, const String& databaseName)
+namespace {
+
+void databaseModified(const WebSecurityOrigin& origin, const String& databaseName)
 {
     if (Platform::current()->databaseObserver())
-        Platform::current()->databaseObserver()->databaseModified(originIdentifier, databaseName);
+        Platform::current()->databaseObserver()->databaseModified(origin, databaseName);
 }
 
+void databaseModifiedCrossThread(const String& originString, const String& databaseName)
+{
+    databaseModified(WebSecurityOrigin::createFromString(originString), databaseName);
+}
+
+} // namespace
+
 void SQLTransactionClient::didCommitWriteTransaction(Database* database)
 {
-    String originIdentifier = createDatabaseIdentifierFromSecurityOrigin(database->getSecurityOrigin());
     String databaseName = database->stringIdentifier();
     ExecutionContext* executionContext = database->getDatabaseContext()->getExecutionContext();
     if (!executionContext->isContextThread()) {
-        executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&databaseModified, originIdentifier, databaseName));
+        executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&databaseModifiedCrossThread, executionContext->getSecurityOrigin()->toString(), databaseName));
     } else {
-        databaseModified(originIdentifier, databaseName);
+        databaseModified(WebSecurityOrigin(executionContext->getSecurityOrigin()), databaseName);
     }
 }
 
 bool SQLTransactionClient::didExceedQuota(Database* database)
 {
     // Chromium does not allow users to manually change the quota for an origin (for now, at least).
     // Don't do anything.
     ASSERT(database->getDatabaseContext()->getExecutionContext()->isContextThread());
     return false;
 }
 
 } // namespace blink