Notify DataUseTabModel of navigations and tab closures

chrome/browser/profiles/profile_impl_io_data.cc

Index: chrome/browser/profiles/profile_impl_io_data.cc
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index 6f1c2a1dda2e2d9737260e8573e110986240c3c2..b2b1aad6ef6194eeea5f20737bec27677a52fdc8 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -65,6 +65,13 @@
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "storage/browser/quota/special_storage_policy.h"
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/data_usage/data_use_tab_model.h"
+#include "chrome/browser/android/data_usage/data_use_ui_tab_model.h"
+#include "chrome/browser/android/data_usage/data_use_ui_tab_model_factory.h"
+#include "chrome/browser/android/data_usage/external_data_use_observer.h"

[sclittle, 2015/11/24 23:07:37]

nit: unnecessary include

[tbansal1, 2015/11/25 20:55:16]

Obsolete.

+#endif  // defined(OS_ANDROID)
+
 namespace {
 
 net::BackendType ChooseCacheBackendType() {
@@ -199,6 +206,15 @@ void ProfileImplIOData::Handle::Init(
           profile_->GetRequestContext(), store.Pass(),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
           db_task_runner);
+
+#if defined(OS_ANDROID)
+  // Pass the DataUseTabModel weak pointer to DataUseUITabModel.
+  chrome::android::DataUseUITabModel* data_use_ui_tab_model =
+      chrome::android::DataUseUITabModelFactory::GetForBrowserContext(profile_);
+  if (data_use_ui_tab_model && !io_data_->IsOffTheRecord())
+    data_use_ui_tab_model->SetDataUseTabModel(
+        g_browser_process->io_thread()->data_use_tab_model());

[sclittle, 2015/11/24 23:07:37]

This is only safe if you can be certain that io_thread()->data_use_tab_model is
always set before this line here is run, otherwise you have a race condition on
io_thread()->data_use_tab_model, or you'll end up copying the WeakPtr before
it's set.

Is this guaranteed to be true? If so, could you add a comment describing that?

[tbansal1, 2015/11/25 20:55:16]

Obsolete.

+#endif  // defined(OS_ANDROID)
 }
 
 content::ResourceContext*