Separate the listeners and getters for the Autofill Private API.

chrome/browser/extensions/api/autofill_private/autofill_private_event_router.cc

 // Copyright 2015 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 "chrome/browser/extensions/api/autofill_private/autofill_private_event_router.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 22 matching lines @@
   // the event router first.
   event_router_ = EventRouter::Get(context_);
   if (!event_router_)
     return;
 
   personal_data_ = autofill::PersonalDataManagerFactory::GetForProfile(
       Profile::FromBrowserContext(context_));
   if (!personal_data_)
     return;
 
-  event_router_->RegisterObserver(
-      this,
-      api::autofill_private::OnAddressListChanged::kEventName);
-  event_router_->RegisterObserver(
-      this,
-      api::autofill_private::OnCreditCardListChanged::kEventName);
-  StartOrStopListeningForChanges();
+  personal_data_->AddObserver(this);
 }
 
 AutofillPrivateEventRouter::~AutofillPrivateEventRouter() {
 }
 
 void AutofillPrivateEventRouter::Shutdown() {
-  if (event_router_)
-    event_router_->UnregisterObserver(this);
-}
-
-void AutofillPrivateEventRouter::OnListenerAdded(
-    const EventListenerInfo& details) {
-  // Start listening to change events and propagate the original lists to
-  // listeners.
-  StartOrStopListeningForChanges();
-  OnPersonalDataChanged();
-}
-
-void AutofillPrivateEventRouter::OnListenerRemoved(
-    const EventListenerInfo& details) {
-  // Stop listening to events if there are no more listeners.
-  StartOrStopListeningForChanges();
+  if (personal_data_)
+    personal_data_->RemoveObserver(this);
 }
 
 void AutofillPrivateEventRouter::OnPersonalDataChanged() {
   DCHECK(personal_data_ && personal_data_->IsDataLoaded());
 
   autofill_util::AddressEntryList addressList =
       extensions::autofill_util::GenerateAddressList(*personal_data_);
   std::unique_ptr<base::ListValue> args(
       api::autofill_private::OnAddressListChanged::Create(addressList)
           .release());
   std::unique_ptr<Event> extension_event(
       new Event(events::AUTOFILL_PRIVATE_ON_ADDRESS_LIST_CHANGED,
                 api::autofill_private::OnAddressListChanged::kEventName,
                 std::move(args)));
   event_router_->BroadcastEvent(std::move(extension_event));
 
   autofill_util::CreditCardEntryList creditCardList =
       extensions::autofill_util::GenerateCreditCardList(*personal_data_);
   args.reset(
       api::autofill_private::OnCreditCardListChanged::Create(creditCardList)
           .release());
   extension_event.reset(
       new Event(events::AUTOFILL_PRIVATE_ON_CREDIT_CARD_LIST_CHANGED,
                 api::autofill_private::OnCreditCardListChanged::kEventName,
                 std::move(args)));
   event_router_->BroadcastEvent(std::move(extension_event));
 }
 
-void AutofillPrivateEventRouter::StartOrStopListeningForChanges() {
-  if (!personal_data_ || !personal_data_->IsDataLoaded())
-    return;
-
-  bool should_listen_for_address_changes = event_router_->HasEventListener(
-      api::autofill_private::OnAddressListChanged::kEventName);
-  bool should_listen_for_credit_card_changes = event_router_->HasEventListener(
-      api::autofill_private::OnCreditCardListChanged::kEventName);
-  bool should_listen = should_listen_for_address_changes ||
-      should_listen_for_credit_card_changes;
-
-  if (should_listen && !listening_)
-    personal_data_->AddObserver(this);
-  else if (!should_listen && listening_)
-    personal_data_->RemoveObserver(this);
-
-  listening_ = should_listen;
-}
-
 AutofillPrivateEventRouter* AutofillPrivateEventRouter::Create(
     content::BrowserContext* context) {
   return new AutofillPrivateEventRouter(context);
 }
 
 }  // namespace extensions