Android WebView: clean up the AwContentsClientBridge webcontents userdata.

android_webview/browser/aw_contents_client_bridge_base.cc

 // Copyright (c) 2013 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 "android_webview/browser/aw_contents_client_bridge_base.h"
 
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 
@@ skipping 29 matching lines @@
 } // namespace
 
 // static
 void AwContentsClientBridgeBase::Associate(
     WebContents* web_contents,
     AwContentsClientBridgeBase* handler) {
   web_contents->SetUserData(kAwContentsClientBridgeBase,
                             new UserData(handler));
 }
 
+void AwContentsClientBridgeBase::Disassociate(
+  WebContents* web_contents) {
+  web_contents->RemoveUserData(kAwContentsClientBridgeBase);
+}
+
 // static
 AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromWebContents(
     WebContents* web_contents) {
   return UserData::GetContents(web_contents);
 }
 
 // static
 AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromID(
     int render_process_id,
     int render_frame_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::RenderFrameHost* rfh =
       content::RenderFrameHost::FromID(render_process_id, render_frame_id);
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(rfh);
   return UserData::GetContents(web_contents);
 }
 
 AwContentsClientBridgeBase::~AwContentsClientBridgeBase() {

[boliu, 2014/09/05 17:40:52]

Does it make sense to call RemoveUerData here rather than adding Disassociate?

 }
 
 }  // namespace android_webview