Show Flash LSOs for Pepper Flash in cookie dialog.

chrome/browser/ui/webui/options2/cookies_view_handler.cc

Index: chrome/browser/ui/webui/options2/cookies_view_handler.cc
diff --git a/chrome/browser/ui/webui/options2/cookies_view_handler.cc b/chrome/browser/ui/webui/options2/cookies_view_handler.cc
index 1817de1ffb0778fdd4b23c5a2edf1fd55ddce403..2a7c3c2f8792c8d735317646cf7f52f0c555ebd8 100644
--- a/chrome/browser/ui/webui/options2/cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/options2/cookies_view_handler.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
@@ -73,6 +74,7 @@ void CookiesViewHandler::GetLocalizedValues(
     { "cookie_indexed_db", IDS_COOKIES_INDEXED_DB },
     { "cookie_local_storage", IDS_COOKIES_LOCAL_STORAGE },
     { "cookie_app_cache", IDS_COOKIES_APPLICATION_CACHE },
+    { "cookie_flash_lso", IDS_COOKIES_FLASH_LSO },
     { "search_cookies", IDS_COOKIES_SEARCH_COOKIES },
     { "remove_cookie", IDS_COOKIES_REMOVE_LABEL },
     { "remove_all_cookie", IDS_COOKIES_REMOVE_ALL_LABEL },
@@ -193,7 +195,8 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
         BrowsingDataIndexedDBHelper::Create(profile),
         BrowsingDataFileSystemHelper::Create(profile),
         BrowsingDataQuotaHelper::Create(profile),
-        BrowsingDataServerBoundCertHelper::Create(profile));
+        BrowsingDataServerBoundCertHelper::Create(profile),
+        BrowsingDataFlashLSOHelper::Create(profile));
     cookies_tree_model_.reset(
         new CookiesTreeModel(apps_map,
                              profile->GetExtensionSpecialStoragePolicy(),
@@ -218,7 +221,7 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
           apps_map[(*it)->id()] = new LocalDataContainer(
               (*it)->name(), (*it)->id(),
               new BrowsingDataCookieHelper(context_getter),
-              NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+              NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);

[James Hawkins, 2012/07/30 03:04:39]

Super sad face.

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

The cookies tree mode and browsing data helper code is in a really bad shape. I
REALLY want to change this over time.

In a first step I moved all browsing data helper stuff into a separate dir. Now
I will improve the code little by little (as time and other high priority tasks
permits). I hope to turn a lot of sad faces into happy faces (including my own).

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

Markus, we should add doing something like having a small constructor with
setters to the list of things to clean up for the browsing data helpers.

[markusheintz_, 2012/07/31 15:09:13]

Yes, I'll file a bug.

         }
       }
       app_cookies_tree_model_.reset(