Revert my change to get the tree green. Not sure why the tests became flaky....

chrome/browser/renderer_host/render_view_host_delegate.h

 // Copyright (c) 2006-2008 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 CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "chrome/browser/autofill_manager.h"
+#include "chrome/common/render_messages.h"
 #include "net/base/load_states.h"
 #include "webkit/glue/webpreferences.h"
-#include "webkit/glue/window_open_disposition.h"
 
 class NavigationEntry;
 class Profile;
 class RenderProcessHost;
 class RenderViewHost;
 class SkBitmap;
 class WebContents;
-class WebKeyboardEvent;
-struct ThumbnailScore;
-struct ViewHostMsg_ContextMenu_Params;
-struct ViewHostMsg_DidPrintPage_Params;
-struct ViewHostMsg_FrameNavigate_Params;
 struct WebDropData;
+enum WindowOpenDisposition;
 
 namespace base {
 class WaitableEvent;
 }
 
 namespace IPC {
 class Message;
 }
 
 namespace gfx {
 class Rect;
 }
 
-namespace webkit_glue {
-struct WebApplicationInfo;
-}
-
 //
 // RenderViewHostDelegate
 //
 //  An interface implemented by an object interested in knowing about the state
 //  of the RenderViewHost.
 //
 //  This interface currently encompasses every type of message that was
 //  previously being sent by WebContents itself. Some of these notifications
 //  may not be relevant to all users of RenderViewHost and we should consider
 //  exposing a more generic Send function on RenderViewHost and a response
@@ skipping 336 matching lines @@
   // page. This is used to avoid uninitiated user downloads (aka carpet
   // bombing), see DownloadRequestManager for details.
   virtual void OnEnterOrSpace() { }
 
   // If this view can be terminated without any side effects
   virtual bool CanTerminate() const { return true; }
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_