Make kClearSiteDataOnExit work correctly for Flash in multi-profile.

content/browser/renderer_host/render_message_filter.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_message_filter.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/worker_pool.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_types.h"
 #include "chrome/browser/download/download_util.h"
+#include "chrome/browser/prefs/pref_service.h"

[Jói, 2011/06/29 03:37:32]

Please don't add a content->pref_service dependency, this dependency has been
removed from content. You may want to e.g. add a method to ContentBrowserClient
(see use of content::GetContentClient()->browser() below) or have the Chrome
side poke this setting somewhere into content whenever it changes.

[Miranda Callahan, 2011/06/29 19:55:31]

Ok -- thanks for the suggestion, it seems to work well.

 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/content_browser_client.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/ppapi_plugin_process_host.h"
 #include "content/browser/ppapi_broker_process_host.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_helper.h"
@@ skipping 88 matching lines @@
  public:
   OpenChannelToNpapiPluginCallback(RenderMessageFilter* filter,
                                    IPC::Message* reply_msg)
       : RenderMessageCompletionCallback(filter, reply_msg) {
   }
 
   virtual int ID() {
     return filter()->render_process_id();
   }
 
+  virtual bool SaveLocalState() {
+    return filter()->save_local_state();
+  }
+
   virtual bool OffTheRecord() {
     return filter()->incognito();
   }
 
   virtual void SetPluginInfo(const webkit::npapi::WebPluginInfo& info) {
     info_ = info;
   }
 
   virtual void OnChannelOpened(const IPC::ChannelHandle& handle) {
     WriteReplyAndDeleteThis(handle);
@@ skipping 136 matching lines @@
     RenderWidgetHelper* render_widget_helper)
     : resource_dispatcher_host_(
           content::GetContentClient()->browser()->GetResourceDispatcherHost()),
       plugin_service_(plugin_service),
       profile_(profile),
       extension_info_map_(profile->GetExtensionInfoMap()),
       request_context_(request_context),
       resource_context_(profile->GetResourceContext()),
       extensions_request_context_(profile->GetRequestContextForExtensions()),
       render_widget_helper_(render_widget_helper),
+      save_local_state_(profile->GetPrefs()->GetBoolean(
+          prefs::kClearSiteDataOnExit)),
       incognito_(profile->IsOffTheRecord()),
       webkit_context_(profile->GetWebKitContext()),
       render_process_id_(render_process_id) {
   DCHECK(request_context_);
 
   profile_->GetPrefs();
   render_widget_helper_->Init(render_process_id_, resource_dispatcher_host_);
 }
 
 RenderMessageFilter::~RenderMessageFilter() {
@@ skipping 559 matching lines @@
     file_for_transit = base::FileDescriptor(file, true);
 #endif
   }
 
   IPC::Message* reply = new ViewMsg_AsyncOpenFile_ACK(
       routing_id, error_code, file_for_transit, message_id);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE, NewRunnableMethod(
           this, &RenderMessageFilter::Send, reply));
 }