| Index: chrome/browser/renderer_host/test/test_render_view_host.h
 | 
| ===================================================================
 | 
| --- chrome/browser/renderer_host/test/test_render_view_host.h	(revision 69765)
 | 
| +++ chrome/browser/renderer_host/test/test_render_view_host.h	(working copy)
 | 
| @@ -60,7 +60,7 @@
 | 
|    virtual void SetSize(const gfx::Size& size) {}
 | 
|    virtual gfx::NativeView GetNativeView() { return NULL; }
 | 
|    virtual void MovePluginWindows(
 | 
| -      const std::vector<webkit::npapi::WebPluginGeometry>& moves) {}
 | 
| +      const std::vector<webkit_glue::WebPluginGeometry>& moves) {}
 | 
|  #if defined(OS_WIN)
 | 
|    virtual void ForwardMouseEventToRenderer(UINT message,
 | 
|                                             WPARAM wparam,
 | 
| 
 | 
| Property changes on: chrome/browser/renderer_host/test/test_render_view_host.h
 | 
| ___________________________________________________________________
 | 
| Deleted: svn:mergeinfo
 | 
| 
 | 
| 
 |