Adds media license nodes to cookie tree model and cookies view.

chrome/browser/browsing_data/local_data_container.cc

Index: chrome/browser/browsing_data/local_data_container.cc
diff --git a/chrome/browser/browsing_data/local_data_container.cc b/chrome/browser/browsing_data/local_data_container.cc
index d1189dcff6b9f83e5129f6510d6ac4d452e10901..3b9b307c38928527714ed15c2a18327da78566a0 100644
--- a/chrome/browser/browsing_data/local_data_container.cc
+++ b/chrome/browser/browsing_data/local_data_container.cc
@@ -26,7 +26,8 @@ LocalDataContainer::LocalDataContainer(
     BrowsingDataChannelIDHelper* channel_id_helper,
     BrowsingDataServiceWorkerHelper* service_worker_helper,
     BrowsingDataCacheStorageHelper* cache_storage_helper,
-    BrowsingDataFlashLSOHelper* flash_lso_helper)
+    BrowsingDataFlashLSOHelper* flash_lso_helper,
+    BrowsingDataMediaLicenseHelper* media_license_helper)
     : appcache_helper_(appcache_helper),
       cookie_helper_(cookie_helper),
       database_helper_(database_helper),
@@ -39,6 +40,7 @@ LocalDataContainer::LocalDataContainer(
       service_worker_helper_(service_worker_helper),
       cache_storage_helper_(cache_storage_helper),
       flash_lso_helper_(flash_lso_helper),
+      media_license_helper_(media_license_helper),
       weak_ptr_factory_(this) {}
 
 LocalDataContainer::~LocalDataContainer() {}
@@ -132,6 +134,13 @@ void LocalDataContainer::Init(CookiesTreeModel* model) {
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
+  if (media_license_helper_.get()) {
+    batches_started_++;
+    media_license_helper_->StartFetching(
+        base::Bind(&LocalDataContainer::OnMediaLicenseInfoLoaded,
+                   weak_ptr_factory_.GetWeakPtr()));
+  }
+
   model_->SetBatchExpectation(batches_started_, true);
 }
 
@@ -234,3 +243,10 @@ void LocalDataContainer::OnFlashLSOInfoLoaded(
   DCHECK(model_);
   model_->PopulateFlashLSOInfo(this);
 }
+
+void LocalDataContainer::OnMediaLicenseInfoLoaded(
+    const MediaLicenseInfoList& media_license_info) {
+  media_license_info_list_ = media_license_info;
+  DCHECK(model_);
+  model_->PopulateMediaLicenseInfo(this);
+}