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

chrome/common/temp_scaffolding_stubs.h

Index: chrome/common/temp_scaffolding_stubs.h
===================================================================
--- chrome/common/temp_scaffolding_stubs.h	(revision 9131)
+++ chrome/common/temp_scaffolding_stubs.h	(working copy)
@@ -16,7 +16,6 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
-#include "base/gfx/native_widget_types.h"
 #include "base/gfx/rect.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
 #include "chrome/browser/browser_process.h"
@@ -27,12 +26,12 @@
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/page_transition_types.h"
+#include "chrome/common/render_messages.h"
 #include "googleurl/src/gurl.h"
 #include "skia/include/SkBitmap.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/window_open_disposition.h"
 
-class AutofillForm;
 class Browser;
 class BookmarkService;
 class CommandLine;
@@ -61,7 +60,6 @@
 class UserScriptMaster;
 class VisitedLinkMaster;
 class WebContents;
-class WebPreferences;
 
 namespace IPC {
 class Message;
@@ -293,8 +291,7 @@
 class IconManager {
 };
 
-struct ViewHostMsg_DidPrintPage_Params;
-struct ViewHostMsg_FrameNavigate_Params;
+struct ViewHostMsg_Resource_Request;
 
 class ResourceDispatcherHost {
  public:
@@ -630,7 +627,7 @@
     return true;
   }
   void SetAlternateErrorPageURL(const GURL&) { NOTIMPLEMENTED(); }
-  void UpdateWebPreferences(const WebPreferences&) { NOTIMPLEMENTED(); }
+  void UpdateWebPreferences(WebPreferences) { NOTIMPLEMENTED(); }
   void ReservePageIDRange(int) { NOTIMPLEMENTED(); }
 };