Notify DataUseTabModel of navigations and tab closures

chrome/browser/android/data_usage/external_data_use_observer.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_EXTERNAL_DATA_USE_OBSERVER_H_
 #define CHROME_BROWSER_ANDROID_DATA_USAGE_EXTERNAL_DATA_USE_OBSERVER_H_
 
 #include <jni.h>
 #include <stdint.h>
 
@@ skipping 78 matching lines @@
   // |label| must not be null. If a match is found, the |label| is set to the
   // matching rule's label.
   bool Matches(const GURL& gurl, std::string* label) const;
 
   // Returns true if the |app_package_name| matches the registered package
   // names. |label| must not be null. If a match is found, the |label| is set
   // to the matching rule's label.
   bool MatchesAppPackageName(const std::string& app_package_name,
                              std::string* label) const;
 
-  DataUseTabModel* data_use_tab_model() const {
-    return data_use_tab_model_.get();
+  const base::WeakPtr<DataUseTabModel>& data_use_tab_model_weak_ptr() const {

[sclittle, 2015/11/23 23:06:16]

nit: Why can't this just be as it was before? Or make this a non-const method
and name it data_use_tab_model() and return data_use_tab_model_->GetWeakPtr()?
You'd want to move the implementation to the .cc file and add a thread_checker_
check.

[tbansal1, 2015/11/24 00:42:03]

weak ptr has to be generated on IO thread,  stored somewhere where it is
accessible on UI thread for consumption by profile_impl_io_data*. The weakptr
can't be stored in IOThread::Globals() because globals are not accessible on UI
thread. Also, it has to be generated before it is consumed by
profile_impl_io_data* because profile_impl_io_data* runs on UI thread.

If I change it to "return data_use_tab_model_->GetWeakPtr()?", it is not clear
where this function would be called, and where the weak ptr would be stored.

[sclittle, 2015/11/24 04:11:50]

I'm confused - this method is run on the IO thread, right? If so, then
data_use_tab_model_->GetWeakPtr() is just as safe to run, right?

+    return data_use_tab_model_weak_ptr_;
   }
 
  private:
   friend class DataUseTabModelTest;
   friend class ExternalDataUseObserverTest;
-  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, SingleRegex);
-  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, TwoRegex);
-  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, MultipleRegex);
-  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, ChangeRegex);
-  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, LabelRemoved);
   FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest,
                            AtMostOneDataUseSubmitRequest);
+  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, BufferDataUseReports);
+  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, BufferSize);
+  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, ChangeRegex);
+  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, HashFunction);
+  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, LabelRemoved);
   FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, MultipleMatchingRules);
+  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, MultipleRegex);
+  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest,
+                           PeriodicFetchMatchingRules);
   FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, ReportsMergedCorrectly);
+  FRIEND_TEST_ALL_PREFIXES(DataUseUITabModelTest, ReportTabEventsTest);
+  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, SingleRegex);
   FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest,
                            TimestampsMergedCorrectly);
-  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, HashFunction);
-  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, BufferSize);
-  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest,
-                           PeriodicFetchMatchingRules);
-  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, BufferDataUseReports);
+  FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, TwoRegex);
   FRIEND_TEST_ALL_PREFIXES(ExternalDataUseObserverTest, Variations);
 
   // DataUseReportKey is a unique identifier for a data use report.
   struct DataUseReportKey {
     DataUseReportKey(const std::string& label,
                      net::NetworkChangeNotifier::ConnectionType connection_type,
                      const std::string& mcc_mnc);
 
     bool operator==(const DataUseReportKey& other) const;
 
@@ skipping 138 matching lines @@
   // Aggregator that sends data use observations to |this|.
   data_usage::DataUseAggregator* data_use_aggregator_;
 
   // Java listener that provides regular expressions to |this|. The regular
   // expressions are applied to the request URLs, and filtered data use is
   // notified to |j_external_data_use_observer_|.
   base::android::ScopedJavaGlobalRef<jobject> j_external_data_use_observer_;
 
   // Maintains tab sessions.
   scoped_ptr<DataUseTabModel> data_use_tab_model_;
+  base::WeakPtr<DataUseTabModel> data_use_tab_model_weak_ptr_;
 
   // True if callback from |FetchMatchingRulesDone| is currently pending.
   bool matching_rules_fetch_pending_;
 
   // True if callback from |SubmitDataUseReportCallback| is currently pending.
   bool submit_data_report_pending_;
 
   // Contains matching rules.
   std::vector<scoped_ptr<MatchingRule>> matching_rules_;
 
@@ skipping 39 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ExternalDataUseObserver);
 };
 
 bool RegisterExternalDataUseObserver(JNIEnv* env);
 
 }  // namespace android
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_ANDROID_DATA_USAGE_EXTERNAL_DATA_USE_OBSERVER_H_