Show Flash LSOs for Pepper Flash in cookie dialog.

chrome/browser/ui/gtk/collected_cookies_gtk.cc

Index: chrome/browser/ui/gtk/collected_cookies_gtk.cc
diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.cc b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
index 9199b0c2a091f51c6b7bc2f68c5ba792b4480189..49aa024d1a6b21d8e0f8e7bd5c54454cf66a519c 100644
--- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc
+++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
@@ -213,21 +213,10 @@ GtkWidget* CollectedCookiesGtk::CreateAllowedPane() {
   TabSpecificContentSettings* content_settings =
       tab_contents_->content_settings();
 
-  const LocalSharedObjectsContainer& allowed_lsos =
+  const LocalSharedObjectsContainer& allowed =

[markusheintz_, 2012/07/30 14:02:15]

Although 'allowed_lsos' is already a bad name this change does not really
improve the name :(.

Maybe something like 'allowed_site_data' or just 'allowed_data' would be better.

same in all other places where you s/allowed_lsos/allowed/
same for blocked_...

[Bernhard Bauer, 2012/07/31 00:20:03]

Done.

       content_settings->allowed_local_shared_objects();
-  ContainerMap apps_map;
-  apps_map[std::string()] = new LocalDataContainer(
-      std::string(), std::string(),
-      allowed_lsos.cookies()->Clone(),
-      allowed_lsos.databases()->Clone(),
-      allowed_lsos.local_storages()->Clone(),
-      allowed_lsos.session_storages()->Clone(),
-      allowed_lsos.appcaches()->Clone(),
-      allowed_lsos.indexed_dbs()->Clone(),
-      allowed_lsos.file_systems()->Clone(),
-      NULL,
-      allowed_lsos.server_bound_certs()->Clone());
-  allowed_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, NULL, true));
+  allowed_cookies_tree_model_ = allowed.CreateCookiesTreeModel();
+
   allowed_cookies_tree_adapter_.reset(
       new gtk_tree::TreeAdapter(this, allowed_cookies_tree_model_.get()));
   allowed_tree_ = gtk_tree_view_new_with_model(
@@ -304,21 +293,10 @@ GtkWidget* CollectedCookiesGtk::CreateBlockedPane() {
   TabSpecificContentSettings* content_settings =
       tab_contents_->content_settings();
 
-  const LocalSharedObjectsContainer& blocked_lsos =
+  const LocalSharedObjectsContainer& blocked =
       content_settings->blocked_local_shared_objects();
-  ContainerMap apps_map;
-  apps_map[std::string()] = new LocalDataContainer(
-      std::string(), std::string(),
-      blocked_lsos.cookies()->Clone(),
-      blocked_lsos.databases()->Clone(),
-      blocked_lsos.local_storages()->Clone(),
-      blocked_lsos.session_storages()->Clone(),
-      blocked_lsos.appcaches()->Clone(),
-      blocked_lsos.indexed_dbs()->Clone(),
-      blocked_lsos.file_systems()->Clone(),
-      NULL,
-      blocked_lsos.server_bound_certs()->Clone());
-  blocked_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, NULL, true));
+  blocked_cookies_tree_model_ = blocked.CreateCookiesTreeModel();
+
   blocked_cookies_tree_adapter_.reset(
       new gtk_tree::TreeAdapter(this, blocked_cookies_tree_model_.get()));
   blocked_tree_ = gtk_tree_view_new_with_model(