Mojo C++ bindings: remove usage of AssociatedGroup from content/

content/browser/dom_storage/local_storage_context_mojo_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/dom_storage/local_storage_context_mojo.h"
 
 #include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 61 matching lines @@
   struct Observation {
     enum { kAdd, kChange, kDelete, kDeleteAll } type;
     std::string key;
     std::string old_value;
     std::string new_value;
     std::string source;
   };
 
   TestLevelDBObserver() : binding_(this) {}
 
-  mojom::LevelDBObserverAssociatedPtrInfo Bind(
-      mojo::AssociatedGroup* associated_group) {
+  mojom::LevelDBObserverAssociatedPtrInfo Bind() {
     mojom::LevelDBObserverAssociatedPtrInfo ptr_info;
-    binding_.Bind(&ptr_info, associated_group);
+    binding_.Bind(&ptr_info);
     return ptr_info;
   }
 
   const std::vector<Observation>& observations() { return observations_; }
 
  private:
   void KeyAdded(const std::vector<uint8_t>& key,
                 const std::vector<uint8_t>& value,
                 const std::string& source) override {
     observations_.push_back({Observation::kAdd, Uint8VectorToStdString(key), "",
@@ skipping 75 matching lines @@
                                               run_loop.QuitClosure(), &result));
     run_loop.Run();
     return result;
   }
 
  private:
   TestBrowserThreadBundle thread_bundle_;
   base::ScopedTempDir temp_path_;
   std::map<std::vector<uint8_t>, std::vector<uint8_t>> mock_data_;
   MockLevelDBDatabase db_;
-  mojo::AssociatedGroup associated_group_;
   mojo::AssociatedBinding<leveldb::mojom::LevelDBDatabase> db_binding_;
 
   scoped_refptr<MockDOMStorageTaskRunner> task_runner_;
   scoped_refptr<DOMStorageContextImpl> dom_storage_context_;
 
   std::unique_ptr<LocalStorageContextMojo> context_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalStorageContextMojoTest);
 };
 
@@ skipping 262 matching lines @@
   context()->OpenLocalStorage(origin2, MakeRequest(&wrapper));
   wrapper->Put(key, value, "source", base::Bind(&NoOpSuccess));
   wrapper.reset();
 
   // Make sure all data gets committed to disk.
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(mock_data().empty());
 
   TestLevelDBObserver observer;
   context()->OpenLocalStorage(origin1, MakeRequest(&wrapper));
-  wrapper->AddObserver(observer.Bind(wrapper.associated_group()));
+  wrapper->AddObserver(observer.Bind());
   base::RunLoop().RunUntilIdle();
 
   context()->DeleteStorage(origin1);
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(1u, observer.observations().size());
   EXPECT_EQ(TestLevelDBObserver::Observation::kDeleteAll,
             observer.observations()[0].type);
 
   // Data from origin2 should exist, including meta-data, but nothing should
@@ skipping 23 matching lines @@
   context()->OpenLocalStorage(origin2, MakeRequest(&wrapper));
   wrapper->Put(key, value, "source", base::Bind(&NoOpSuccess));
   wrapper.reset();
 
   // Make sure all data gets committed to disk.
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(mock_data().empty());
 
   TestLevelDBObserver observer;
   context()->OpenLocalStorage(origin1, MakeRequest(&wrapper));
-  wrapper->AddObserver(observer.Bind(wrapper.associated_group()));
+  wrapper->AddObserver(observer.Bind());
   wrapper->Put(StdStringToUint8Vector("key2"), value, "source",
                base::Bind(&NoOpSuccess));
   base::RunLoop().RunUntilIdle();
 
   context()->DeleteStorage(origin1);
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(2u, observer.observations().size());
   EXPECT_EQ(TestLevelDBObserver::Observation::kAdd,
             observer.observations()[0].type);
@@ skipping 325 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   // Data should have been preserved now.
   context = base::MakeUnique<LocalStorageContextMojo>(
       connector(), nullptr, base::FilePath(), test_path);
   EXPECT_TRUE(DoTestGet(context.get(), key, &result));
   EXPECT_EQ(value, result);
 }
 
 }  // namespace content