Fix for crash in testWindows test

android_webview/browser/browser_view_renderer_impl.h

 // 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_IMPL_H_
 #define ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_IMPL_H_
 
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/renderer_host/view_renderer_host.h"
 #include "content/public/browser/android/compositor.h"
@@ skipping 20 matching lines @@
 
 namespace android_webview {
 
 class BrowserViewRendererImpl
     : public BrowserViewRenderer,
       public ViewRendererHost::Client,
       public content::Compositor::Client {
  public:
   static BrowserViewRendererImpl* Create(BrowserViewRenderer::Client* client,
                                          JavaHelper* java_helper);
+  static BrowserViewRendererImpl* FromWebContents(
+      content::WebContents* contents);
+  static void SetAwDrawSWFunctionTable(AwDrawSWFunctionTable* table);
+
   virtual ~BrowserViewRendererImpl();
 
-  // Platform methods.
-  static void SetAwDrawSWFunctionTable(AwDrawSWFunctionTable* table);
-
   // BrowserViewRenderer implementation.
-  // |content_view_core| must not outlive |this| BrowserViewRenderer instance.
   virtual void SetContents(
       content::ContentViewCore* content_view_core) OVERRIDE;
   virtual void DrawGL(AwDrawGLInfo* draw_info) OVERRIDE;
   virtual void SetScrollForHWFrame(int x, int y) OVERRIDE;
   virtual bool DrawSW(jobject java_canvas, const gfx::Rect& clip) OVERRIDE;
   virtual base::android::ScopedJavaLocalRef<jobject> CapturePicture() OVERRIDE;
   virtual void EnableOnNewPicture(OnNewPictureMode mode) OVERRIDE;
   virtual void OnVisibilityChanged(
       bool view_visible, bool window_visible) OVERRIDE;
   virtual void OnSizeChanged(int width, int height) OVERRIDE;
   virtual void OnAttachedToWindow(int width, int height) OVERRIDE;
   virtual void OnDetachedFromWindow() OVERRIDE;
 
   // content::Compositor::Client implementation.
   virtual void ScheduleComposite() OVERRIDE;
 
   // ViewRendererHost::Client implementation.
   virtual void OnPictureUpdated(int process_id, int render_view_id) OVERRIDE;
 
  protected:
   BrowserViewRendererImpl(BrowserViewRenderer::Client* client,
                           JavaHelper* java_helper);
 
  private:
+  class UserData;
+  friend class UserData;
+
   // Returns the latest locally available picture if any.
   // If none is available will synchronously request the latest one
   // and block until the result is received.
   skia::RefPtr<SkPicture> GetLastCapturedPicture();
   void OnPictureUpdated();
 
   void SetCompositorVisibility(bool visible);
   void ResetCompositor();
   void Invalidate();
   bool RenderSW(SkCanvas* canvas);
   bool RenderPicture(SkCanvas* canvas);
 
   void OnFrameInfoUpdated(const gfx::SizeF& content_size,
                           const gfx::Vector2dF& scroll_offset,
                           float page_scale_factor);
 
+  // Called when |web_contents_| is disconnected from |this| object.
+  void WebContentsGone();
+
   BrowserViewRenderer::Client* client_;
   BrowserViewRenderer::JavaHelper* java_helper_;
 
   scoped_ptr<ViewRendererHost> view_renderer_host_;
   scoped_ptr<content::Compositor> compositor_;
 
   // Ensures content keeps clipped within the view during transformations.
   scoped_refptr<cc::Layer> view_clip_layer_;
 
   // Applies the transformation matrix.
@@ skipping 24 matching lines @@
 
   // Used to observe frame metadata updates.
   content::ContentViewCore::UpdateFrameInfoCallback update_frame_info_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserViewRendererImpl);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_IMPL_H_