Index: content/renderer/dom_storage/local_storage_cached_area.cc |
diff --git a/content/renderer/dom_storage/local_storage_cached_area.cc b/content/renderer/dom_storage/local_storage_cached_area.cc |
index a662cb7df8f421925eb4ac062c6f499e6e17707e..77ab50b3df3bbe74cc0378a03532e5343b6054ce 100644 |
--- a/content/renderer/dom_storage/local_storage_cached_area.cc |
+++ b/content/renderer/dom_storage/local_storage_cached_area.cc |
@@ -37,12 +37,9 @@ std::vector<uint8_t> String16ToUint8Vector(const base::string16& input) { |
class GetAllCallback : public mojom::LevelDBWrapperGetAllCallback { |
public: |
static mojom::LevelDBWrapperGetAllCallbackAssociatedPtrInfo CreateAndBind( |
- mojo::AssociatedGroup* associated_group, |
const base::Callback<void(bool)>& callback) { |
mojom::LevelDBWrapperGetAllCallbackAssociatedPtrInfo ptr_info; |
- mojom::LevelDBWrapperGetAllCallbackAssociatedRequest request; |
- associated_group->CreateAssociatedInterface( |
- mojo::AssociatedGroup::WILL_PASS_PTR, &ptr_info, &request); |
+ auto request = mojo::MakeRequest(&ptr_info); |
mojo::MakeStrongAssociatedBinding( |
base::WrapUnique(new GetAllCallback(callback)), std::move(request)); |
return ptr_info; |
@@ -84,7 +81,7 @@ LocalStorageCachedArea::LocalStorageCachedArea( |
storage_partition_service->OpenLocalStorage(origin_, |
mojo::MakeRequest(&leveldb_)); |
mojom::LevelDBObserverAssociatedPtrInfo ptr_info; |
- binding_.Bind(&ptr_info, leveldb_.associated_group()); |
+ binding_.Bind(&ptr_info); |
leveldb_->AddObserver(std::move(ptr_info)); |
} |
@@ -290,7 +287,6 @@ void LocalStorageCachedArea::EnsureLoaded() { |
leveldb::mojom::DatabaseError status = leveldb::mojom::DatabaseError::OK; |
std::vector<content::mojom::KeyValuePtr> data; |
leveldb_->GetAll(GetAllCallback::CreateAndBind( |
- leveldb_.associated_group(), |
base::Bind(&LocalStorageCachedArea::OnGetAllComplete, |
weak_factory_.GetWeakPtr())), |
&status, &data); |