Show Flash LSOs for Pepper Flash in cookie dialog.

chrome/browser/browsing_data/local_data_container.h

Index: chrome/browser/browsing_data/local_data_container.h
diff --git a/chrome/browser/browsing_data/local_data_container.h b/chrome/browser/browsing_data/local_data_container.h
index 67edf7c29d3d16e6a45f499ee49e7f7a66b74671..b0b2fd7afb4344c7f686d2b164e607bc6accee92 100644
--- a/chrome/browser/browsing_data/local_data_container.h
+++ b/chrome/browser/browsing_data/local_data_container.h
@@ -5,6 +5,11 @@
 #ifndef CHROME_BROWSER_BROWSING_DATA_LOCAL_DATA_CONTAINER_H_
 #define CHROME_BROWSER_BROWSING_DATA_LOCAL_DATA_CONTAINER_H_
 
+#include <list>
+#include <map>
+#include <string>
+#include <vector>
+
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
@@ -18,8 +23,9 @@
 #include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "net/base/server_bound_cert_store.h"
 
-class LocalDataContainer;
+class BrowsingDataFlashLSOHelper;
 class CookiesTreeModel;
+class LocalDataContainer;
 
 namespace net {
 class CanonicalCookie;
@@ -42,6 +48,7 @@ typedef std::list<BrowsingDataFileSystemHelper::FileSystemInfo>
 typedef std::list<BrowsingDataQuotaHelper::QuotaInfo> QuotaInfoList;
 typedef net::ServerBoundCertStore::ServerBoundCertList ServerBoundCertList;
 typedef std::map<GURL, std::list<appcache::AppCacheInfo> > AppCacheInfoMap;
+typedef std::vector<std::string> FlashLSODomainList;

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

You use the term "site" instead of "domain" in
"browsing_data_flash_lso_helper.*" Could you replace domain with site here and
elsewhere?

[Bernhard Bauer, 2012/07/31 19:16:59]

I'm actually doing that on purpose. "Site" is the term used by the ClearSiteData
API (see https://wiki.mozilla.org/NPAPI:ClearSiteData[1]), so I'm using that
term in all classes that are essentially a wrapper around that API. However,
"site" is a somewhat fuzzy term, and the spec says that it actually means domain
(and Flash also keys LSOs on the domain), so I'm using "domain" in the cookie
tree model where the semantic actually matters.

[1] I'm not using the NPAPI version, but I tried to keep the Pepper version as
similar as possible.

 
 } // namespace
 
@@ -64,7 +71,8 @@ class LocalDataContainer {
       BrowsingDataIndexedDBHelper* indexed_db_helper,
       BrowsingDataFileSystemHelper* file_system_helper,
       BrowsingDataQuotaHelper* quota_helper,
-      BrowsingDataServerBoundCertHelper* server_bound_cert_helper);
+      BrowsingDataServerBoundCertHelper* server_bound_cert_helper,
+      BrowsingDataFlashLSOHelper* flash_data_helper);
   virtual ~LocalDataContainer();
 
   // This method must be called to start the process of fetching the resources.
@@ -85,6 +93,7 @@ class LocalDataContainer {
   friend class CookieTreeFileSystemNode;
   friend class CookieTreeQuotaNode;
   friend class CookieTreeServerBoundCertNode;
+  friend class CookieTreeFlashLSONode;
 
   // Callback methods to be invoked when fetching the data is complete.
   void OnAppCacheModelInfoLoaded();
@@ -100,6 +109,7 @@ class LocalDataContainer {
       const FileSystemInfoList& file_system_info);
   void OnQuotaModelInfoLoaded(const QuotaInfoList& quota_info);
   void OnServerBoundCertModelInfoLoaded(const ServerBoundCertList& cert_list);
+  void OnFlashLSOInfoLoaded(const FlashLSODomainList& domains);

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

s/domains/sites/

 
   // The app name and id, to which this container object is for.
   std::string app_name_;
@@ -116,6 +126,7 @@ class LocalDataContainer {
   scoped_refptr<BrowsingDataFileSystemHelper> file_system_helper_;
   scoped_refptr<BrowsingDataQuotaHelper> quota_helper_;
   scoped_refptr<BrowsingDataServerBoundCertHelper> server_bound_cert_helper_;
+  scoped_refptr<BrowsingDataFlashLSOHelper> flash_lso_helper_;
 
   // Storage for all the data that was retrieved through the helper objects.
   // The collected data is used for (re)creating the CookiesTreeModel.
@@ -128,6 +139,7 @@ class LocalDataContainer {
   FileSystemInfoList file_system_info_list_;
   QuotaInfoList quota_info_list_;
   ServerBoundCertList server_bound_cert_list_;
+  FlashLSODomainList flash_lso_domain_list_;

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

domain/site/

 
   // A delegate, which must outlive this object. The update callbacks use the
   // delegate to deliver the updated data to the CookieTreeModel.