When "Clear site data on exit" is checked, only pass the private mode flag to Flash.

content/browser/renderer_host/render_message_filter.cc

Index: content/browser/renderer_host/render_message_filter.cc
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 09589540c029ab90602e47532d8b8487501f3499..5d87e26b8329da0fca6a4d03283620c04d5635a9 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -191,7 +191,17 @@ class RenderMessageFilter::OpenChannelToNpapiPluginCallback
   }
 
   virtual bool OffTheRecord() OVERRIDE {
-    return filter()->OffTheRecord();
+    if (filter()->OffTheRecord())
+      return true;
+    if (content::GetContentClient()->browser()->AllowSaveLocalState(context_))
+      return false;
+
+    // For now, only disallow storing data for Flash <http://crbug.com/97319>.
+    for (size_t i = 0; i < info_.mime_types.size(); ++i) {
+      if (info_.mime_types[i].mime_type == "application/x-shockwave-flash")

[jam, 2011/10/07 16:08:02]

nit: please use kFlashPluginSwfMimeType from plugin_constants.h

[Bernhard Bauer, 2011/10/07 16:26:19]

Done. Thanks for the tip!

+        return true;
+    }
+    return false;
   }
 
   virtual void SetPluginInfo(const webkit::WebPluginInfo& info) OVERRIDE {
@@ -374,9 +384,7 @@ void RenderMessageFilter::OnDestruct() const {
 }
 
 bool RenderMessageFilter::OffTheRecord() const {
-  return incognito_ ||
-         !content::GetContentClient()->browser()->AllowSaveLocalState(
-             resource_context_);
+  return incognito_;
 }
 
 void RenderMessageFilter::OnMsgCreateWindow(