Make LevelDBObserver an associated interface to LevelDBWrapper.

content/browser/leveldb_wrapper_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_LEVELDB_WRAPPER_IMPL_H_
 #define CONTENT_BROWSER_LEVELDB_WRAPPER_IMPL_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 26 matching lines @@
   LevelDBWrapperImpl(leveldb::mojom::LevelDBDatabase* database,
                      const std::string& prefix,
                      size_t max_size,
                      base::TimeDelta default_commit_delay,
                      int max_bytes_per_hour,
                      int max_commits_per_hour,
                      const base::Closure& no_bindings_callback);
   ~LevelDBWrapperImpl() override;
 
   void Bind(mojom::LevelDBWrapperRequest request);
-  void AddObserver(mojom::LevelDBObserverPtr observer);
 
   // Commence aggressive flushing. This should be called early during startup,
   // before any localStorage writing. Currently scheduled writes will not be
   // rescheduled and will be flushed at the scheduled time after which
   // aggressive flushing will commence.
   static void EnableAggressiveCommitDelay();
 
  private:
   friend class LevelDBWrapperImplTest;
 
@@ skipping 27 matching lines @@
   struct CommitBatch {
     bool clear_all_first;
     ChangedValueMap changed_values;
 
     CommitBatch();
     ~CommitBatch();
     size_t GetDataSize() const;
   };
 
   // LevelDBWrapperImpl:
+  void AddObserver(mojom::LevelDBObserverAssociatedPtrInfo observer) override;
   void Put(const std::vector<uint8_t>& key,
            const std::vector<uint8_t>& value,
            const std::string& source,
            const PutCallback& callback) override;
   void Delete(const std::vector<uint8_t>& key,
               const std::string& source,
               const DeleteCallback& callback) override;
   void DeleteAll(const std::string& source,
                  const DeleteAllCallback& callback) override;
   void Get(const std::vector<uint8_t>& key,
            const GetCallback& callback) override;
   void GetAll(const std::string& source,
               const GetAllCallback& callback) override;
 
   void OnConnectionError();
   void LoadMap(const base::Closure& completion_callback);
   void OnLoadComplete(leveldb::mojom::DatabaseError status,
                       std::vector<leveldb::mojom::KeyValuePtr> data);
   void CreateCommitBatchIfNeeded();
   void StartCommitTimer();
   base::TimeDelta ComputeCommitDelay() const;
   void CommitChanges();
   void OnCommitComplete(leveldb::mojom::DatabaseError error);
 
   std::vector<uint8_t> prefix_;
   mojo::BindingSet<mojom::LevelDBWrapper> bindings_;
-  mojo::InterfacePtrSet<mojom::LevelDBObserver> observers_;
+  mojo::AssociatedInterfacePtrSet<mojom::LevelDBObserver> observers_;
   base::Closure no_bindings_callback_;
   leveldb::mojom::LevelDBDatabase* database_;
   std::unique_ptr<ValueMap> map_;
   std::vector<base::Closure> on_load_complete_tasks_;
   size_t bytes_used_;
   size_t max_size_;
   base::TimeTicks start_time_;
   base::TimeDelta default_commit_delay_;
   RateLimiter data_rate_limiter_;
   RateLimiter commit_rate_limiter_;
   int commit_batches_in_flight_ = 0;
   std::unique_ptr<CommitBatch> commit_batch_;
   base::WeakPtrFactory<LevelDBWrapperImpl> weak_ptr_factory_;
 
   static bool s_aggressive_flushing_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(LevelDBWrapperImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LEVELDB_WRAPPER_IMPL_H_