Notify DataUseTabModel of navigations and tab closures

chrome/browser/io_thread.h

 // Copyright (c) 2012 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_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 21 matching lines @@
 class PrefRegistrySimple;
 class SystemURLRequestContextGetter;
 
 namespace base {
 class CommandLine;
 }
 
 #if defined(OS_ANDROID)
 namespace chrome {
 namespace android {
+class DataUseTabModel;
 class ExternalDataUseObserver;
 }
 }
 #endif  // defined(OS_ANDROID)
 
 namespace chrome_browser_net {
 class DnsProbeService;
 }
 
 namespace extensions {
@@ skipping 208 matching lines @@
 
   base::TimeTicks creation_time() const;
 
   data_usage::DataUseAggregator* data_use_aggregator() const;
 
   // Returns true if QUIC should be enabled for data reduction proxy, either as
   // a result of a field trial or a command line flag.
   static bool ShouldEnableQuicForDataReductionProxy();
 
 #if defined(OS_ANDROID)
-chrome::android::ExternalDataUseObserver* external_data_use_observer() const {
-  return external_data_use_observer_.get();
-}
+  chrome::android::ExternalDataUseObserver* external_data_use_observer() const {
+    return external_data_use_observer_.get();
+  }
+
+  base::WeakPtr<chrome::android::DataUseTabModel> data_use_tab_model() const {

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

Why expose this here? Why not just call
external_data_use_observer()->data_use_tab_model()->GetWeakPtr(), and remove the
stored WeakPtr |data_use_tab_model_| below?

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

GetWeakPtr() needs to be called on IO thread. profile_impl* is on UI thread. I
call GetWeakPtr() here on IO, save it, and then just pass it along in
profile_impl*.

+    return data_use_tab_model_;
+  }
 #endif  // defined(OS_ANDROID)
 
  private:
   // Map from name to value for all parameters associate with a field trial.
   typedef std::map<std::string, std::string> VariationParameters;
 
   // Provide SystemURLRequestContextGetter with access to
   // InitSystemRequestContext().
   friend class SystemURLRequestContextGetter;
 
@@ skipping 249 matching lines @@
   // True if QUIC is allowed by policy.
   bool is_quic_allowed_by_policy_;
 
   // Global aggregator of data use. It must outlive the
   // |system_network_delegate|.
   scoped_ptr<data_usage::DataUseAggregator> data_use_aggregator_;
   // An external observer of data use.
 #if defined(OS_ANDROID)
   scoped_ptr<chrome::android::ExternalDataUseObserver>
       external_data_use_observer_;
+  // WeakPtr to DataUseTabModel to be used on IO thread.
+  base::WeakPtr<chrome::android::DataUseTabModel> data_use_tab_model_;
 #endif  // defined(OS_ANDROID)
 
   const base::TimeTicks creation_time_;
 
   base::WeakPtrFactory<IOThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_