Notify DataUseTabModel of navigations and tab closures

chrome/browser/android/data_usage/data_use_tab_model.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/android/data_usage/data_use_tab_model.h"
 
 #include "base/time/time.h"
 #include "chrome/browser/android/data_usage/external_data_use_observer.h"
 #include "chrome/browser/android/data_usage/tab_data_use_entry.h"
+#include "content/public/browser/browser_thread.h"
 
 namespace {
 
 // TODO(rajendrant): To be changeable via field trial.
 // Indicates the maximum number of tabs to maintain session information about.
 const size_t kMaxTabEntries = 200;
 
 // Returns true if |tab_id| is a valid tab ID.
 bool IsValidTabID(int32_t tab_id) {
   return tab_id >= 0;
 }
 
 }  // namespace
 
 namespace chrome {
 
 namespace android {
 
 size_t DataUseTabModel::GetMaxTabEntriesForTests() {
   return kMaxTabEntries;
 }
 
 DataUseTabModel::DataUseTabModel(
     const ExternalDataUseObserver* data_use_observer,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
     : data_use_observer_(data_use_observer),
-      observer_list_(new base::ObserverListThreadSafe<TabDataUseObserver>),
       weak_factory_(this) {}
 
 DataUseTabModel::~DataUseTabModel() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 base::WeakPtr<DataUseTabModel> DataUseTabModel::GetWeakPtr() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return weak_factory_.GetWeakPtr();
 }
 
 void DataUseTabModel::OnNavigationEvent(int32_t tab_id,
                                         TransitionType transition,
-                                        const GURL& url,
-                                        const std::string& package) {
+                                        const GURL& url) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(IsValidTabID(tab_id));
 
-  // TODO(rajendrant): implementation to use package.
   switch (transition) {
     case TRANSITION_OMNIBOX_SEARCH:
+    case TRANSITION_OMNIBOX_NAVIGATION:
     case TRANSITION_FROM_EXTERNAL_APP: {
       // Enter events.
       std::string label;
       if (data_use_observer_->Matches(url, &label)) {
         // TODO(rajendrant): Need to handle scenarios where these labels change
         // in the middle of a tab session. Should |data_use_observer_| notify us
         // about a cleanup. What happens to currently active tab sessions.
         DCHECK(!label.empty());
         StartTrackingDataUse(tab_id, label);
       }
       break;
     }
 
     case TRANSITION_FROM_NAVSUGGEST:
-    case TRANSITION_OMNIBOX_NAVIGATION:
     case TRANSITION_BOOKMARK:
     case TRANSITION_HISTORY_ITEM:
     case TRANSITION_TO_EXTERNAL_APP:
       // Exit events.
       EndTrackingDataUse(tab_id);
       break;
 
     default:
       NOTREACHED();
       break;
@@ skipping 28 matching lines @@
       active_tabs_.find(data_use.tab_id);
   if (tab_entry_iterator != active_tabs_.end()) {
     return tab_entry_iterator->second.GetLabel(data_use.request_start,
                                                output_label);
   }
 
   return false;  // Tab session not found.
 }
 
 void DataUseTabModel::AddObserver(TabDataUseObserver* observer) {
-  observer_list_->AddObserver(observer);
+  observer_list_.AddObserver(observer);

[sclittle, 2015/11/18 21:42:03]

nit: Add DCHECK(thread_checker_.CalledOnValidThread());

[tbansal1, 2015/11/19 00:47:06]

Done.

 }
 
 void DataUseTabModel::RemoveObserver(TabDataUseObserver* observer) {
-  observer_list_->RemoveObserver(observer);
+  observer_list_.RemoveObserver(observer);

[sclittle, 2015/11/18 21:42:03]

nit: Add DCHECK(thread_checker_.CalledOnValidThread());

[tbansal1, 2015/11/19 00:47:06]

Done.

 }
 
 void DataUseTabModel::NotifyObserversOfTrackingStarting(int32_t tab_id) {
-  observer_list_->Notify(FROM_HERE, &TabDataUseObserver::NotifyTrackingStarting,
-                         tab_id);
+  FOR_EACH_OBSERVER(TabDataUseObserver, observer_list_,

[sclittle, 2015/11/18 21:42:03]

nit: Add DCHECK(thread_checker_.CalledOnValidThread());

[tbansal1, 2015/11/19 00:47:06]

Done.

+                    NotifyTrackingStarting(tab_id));
 }
 
 void DataUseTabModel::NotifyObserversOfTrackingEnding(int32_t tab_id) {
-  observer_list_->Notify(FROM_HERE, &TabDataUseObserver::NotifyTrackingEnding,
-                         tab_id);
+  FOR_EACH_OBSERVER(TabDataUseObserver, observer_list_,

[sclittle, 2015/11/18 21:42:03]

nit: Add DCHECK(thread_checker_.CalledOnValidThread());

same with the other methods

[tbansal1, 2015/11/19 00:47:06]

Done.

+                    NotifyTrackingEnding(tab_id));
 }
 
 void DataUseTabModel::StartTrackingDataUse(int32_t tab_id,
                                            const std::string& label) {
   // TODO(rajendrant): Explore ability to handle changes in label for current
   // session.
   bool new_tab_entry_added = false;
   TabEntryMap::iterator tab_entry_iterator = active_tabs_.find(tab_id);
   if (tab_entry_iterator == active_tabs_.end()) {
     auto new_entry =
@@ skipping 43 matching lines @@
       }
     }
     DCHECK(oldest_tab_entry_iterator != active_tabs_.end());
     active_tabs_.erase(oldest_tab_entry_iterator);
   }
 }
 
 }  // namespace android
 
 }  // namespace chrome