| Index: content/child/indexed_db/webidbfactory_impl.cc
|
| diff --git a/content/child/indexed_db/webidbfactory_impl.cc b/content/child/indexed_db/webidbfactory_impl.cc
|
| index 888c7fbe4e7d555b8eb1d111bcc358f2098e926c..7d11079ec3d6a7f196ed73c39127f9f0c75908e4 100644
|
| --- a/content/child/indexed_db/webidbfactory_impl.cc
|
| +++ b/content/child/indexed_db/webidbfactory_impl.cc
|
| @@ -4,11 +4,9 @@
|
|
|
| #include "content/child/indexed_db/webidbfactory_impl.h"
|
|
|
| -#include "content/child/child_thread_impl.h"
|
| #include "content/child/indexed_db/indexed_db_callbacks_impl.h"
|
| #include "content/child/indexed_db/indexed_db_database_callbacks_impl.h"
|
| #include "content/child/storage_util.h"
|
| -#include "content/public/child/worker_thread.h"
|
| #include "ipc/ipc_sync_channel.h"
|
| #include "mojo/public/cpp/bindings/strong_associated_binding.h"
|
| #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
|
| @@ -38,8 +36,7 @@ class WebIDBFactoryImpl::IOThreadHelper {
|
|
|
| void GetDatabaseNames(std::unique_ptr<IndexedDBCallbacksImpl> callbacks,
|
| const url::Origin& origin);
|
| - void Open(int32_t worker_thread,
|
| - const base::string16& name,
|
| + void Open(const base::string16& name,
|
| int64_t version,
|
| int64_t transaction_id,
|
| std::unique_ptr<IndexedDBCallbacksImpl> callbacks,
|
| @@ -91,8 +88,8 @@ void WebIDBFactoryImpl::open(const WebString& name,
|
| io_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&IOThreadHelper::Open, base::Unretained(io_helper_),
|
| - WorkerThread::GetCurrentId(), base::string16(name), version,
|
| - transaction_id, base::Passed(&callbacks_impl),
|
| + base::string16(name), version, transaction_id,
|
| + base::Passed(&callbacks_impl),
|
| base::Passed(&database_callbacks_impl), url::Origin(origin)));
|
| }
|
|
|
| @@ -150,14 +147,13 @@ void WebIDBFactoryImpl::IOThreadHelper::GetDatabaseNames(
|
| }
|
|
|
| void WebIDBFactoryImpl::IOThreadHelper::Open(
|
| - int32_t worker_thread,
|
| const base::string16& name,
|
| int64_t version,
|
| int64_t transaction_id,
|
| std::unique_ptr<IndexedDBCallbacksImpl> callbacks,
|
| std::unique_ptr<IndexedDBDatabaseCallbacksImpl> database_callbacks,
|
| const url::Origin& origin) {
|
| - GetService()->Open(worker_thread, GetCallbacksProxy(std::move(callbacks)),
|
| + GetService()->Open(GetCallbacksProxy(std::move(callbacks)),
|
| GetDatabaseCallbacksProxy(std::move(database_callbacks)),
|
| origin, name, version, transaction_id);
|
| }
|
|
|