Notify DataUseTabModel of navigations and tab closures

chrome/browser/android/data_usage/data_use_tab_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_DATA_USAGE_DATA_USE_TAB_MODEL_H_
 #define CHROME_BROWSER_ANDROID_DATA_USAGE_DATA_USE_TAB_MODEL_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 65 matching lines @@
 
   DataUseTabModel(const ExternalDataUseObserver* data_use_observer,
                   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
 
   ~DataUseTabModel();
 
   base::WeakPtr<DataUseTabModel> GetWeakPtr();
 
   // Notifies the DataUseTabModel of navigation events. |tab_id| is the source
   // tab of the generated event, |transition| indicates the type of the UI
-  // event/transition,  |url| is the URL in the source tab, |package| indicates
-  // the android package name of external application that initiated the event.
+  // event/transition,  |url| is the URL in the source tab.
   void OnNavigationEvent(int32_t tab_id,
                          TransitionType transition,
-                         const GURL& url,
-                         const std::string& package);
+                         const GURL& url);
 
   // Notifies the DataUseTabModel that tab with |tab_id| is closed. Any active
   // tracking sessions for the tab are terminated, and the tab is marked as
   // closed.
   void OnTabCloseEvent(int32_t tab_id);
 
   // Gets the label for the |data_use| object. |output_label| must not be null.
   // If a tab tracking session is found that was active at the time of request
   // start of |data_use|, returns true and |output_label| is populated with its
   // label. Otherwise returns false and |output_label| is set to empty string.
@@ skipping 43 matching lines @@
   // After removing expired tab entries, if the size of |active_tabs_| exceeds
   // |kMaxTabEntries|, oldest unexpired tab entries will be removed until its
   // size is |kMaxTabEntries|.
   void CompactTabEntries();
 
   // Contains the ExternalDataUseObserver. The caller must ensure that the
   // |data_use_observer_| outlives this instance.
   const ExternalDataUseObserver* data_use_observer_;
 
   // List of observers waiting for tracking session start and end notifications.
   const scoped_refptr<base::ObserverListThreadSafe<TabDataUseObserver>>

[sclittle, 2015/11/17 22:50:11]

nit: If you're certain that all observers will be on the IO thread, then it's
faster to use a regular ObserverList than an ObserverListThreadSafe.

[tbansal1, 2015/11/18 01:32:22]

Done.

       observer_list_;
 
   // Maintains the tracking sessions of multiple tabs.
   TabEntryMap active_tabs_;
 
   base::ThreadChecker thread_checker_;
 
   // |weak_factory_| is used for generating weak pointers to be passed to
   // DataUseTabUIManager on the UI thread.

[sclittle, 2015/11/17 22:50:11]

nit: What do you mean, passing the WeakPtrs to the UI thread? It might just be
clearer to remove this comment altogether.

[tbansal1, 2015/11/18 01:32:22]

Done.

   base::WeakPtrFactory<DataUseTabModel> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DataUseTabModel);
 };
 
 }  // namespace android
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_ANDROID_DATA_USAGE_DATA_USE_TAB_MODEL_H_