Remove WebSecurityOrigin from chromium

content/browser/in_process_webkit/indexed_db_dispatcher_host.cc

Index: content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
index 4d017040ac71d5348d5a2e85e8e36c8c5c85ebc5..d4984219db7ba348de33a45a20c0b57f04c90b01 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -229,12 +229,9 @@ void IndexedDBDispatcherHost::OnIDBFactoryGetDatabaseNames(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
   base::FilePath indexed_db_path = indexed_db_context_->data_path();
 
-  WebSecurityOrigin origin(
-      WebSecurityOrigin::createFromDatabaseIdentifier(params.origin));
-
   Context()->GetIDBFactory()->getDatabaseNames(
       new IndexedDBCallbacks<WebVector<WebString> >(this, params.ipc_thread_id,
-      params.ipc_callbacks_id), origin, NULL,
+      params.ipc_callbacks_id), params.database_identifier,
       webkit_base::FilePathToWebString(indexed_db_path));
 }
 
@@ -243,9 +240,8 @@ void IndexedDBDispatcherHost::OnIDBFactoryOpen(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
   base::FilePath indexed_db_path = indexed_db_context_->data_path();
 
-  GURL origin_url = DatabaseUtil::GetOriginFromIdentifier(params.origin);
-  WebSecurityOrigin origin(
-      WebSecurityOrigin::createFromDatabaseIdentifier(params.origin));
+  GURL origin_url =
+      DatabaseUtil::GetOriginFromIdentifier(params.database_identifier);
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
 
@@ -264,7 +260,8 @@ void IndexedDBDispatcherHost::OnIDBFactoryOpen(
                                      origin_url),
       new IndexedDBDatabaseCallbacks(this, params.ipc_thread_id,
                                      params.ipc_database_callbacks_id),
-      origin, NULL, webkit_base::FilePathToWebString(indexed_db_path));
+      params.database_identifier,
+      webkit_base::FilePathToWebString(indexed_db_path));
 }
 
 void IndexedDBDispatcherHost::OnIDBFactoryDeleteDatabase(
@@ -277,7 +274,7 @@ void IndexedDBDispatcherHost::OnIDBFactoryDeleteDatabase(
       new IndexedDBCallbacks<WebData>(this,
                                       params.ipc_thread_id,
                                       params.ipc_callbacks_id),
-      WebSecurityOrigin::createFromDatabaseIdentifier(params.origin), NULL,
+      params.database_identifier,
       webkit_base::FilePathToWebString(indexed_db_path));
 }