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

chrome/common/temp_scaffolding_stubs.h

 // Copyright (c) 2009 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_COMMON_TEMP_SCAFFOLDING_STUBS_H_
 #define CHROME_COMMON_TEMP_SCAFFOLDING_STUBS_H_
 
 // This file provides declarations and stub definitions for classes we encouter
 // during the porting effort. It is not meant to be permanent, and classes will
 // be removed from here as they are fleshed out more completely.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #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"
 #include "chrome/browser/cache_manager_host.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents_type.h"
 #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;
 class ConstrainedWindow;
 class DownloadManager;
 class HistoryService;
 class MetricsService;
 class ModalHtmlDialogDelegate;
 class NavigationController;
 class NavigationEntry;
 class NotificationService;
 class PluginService;
 class ProfileManager;
 class Profile;
 class RenderProcessHost;
 class RenderWidgetHelper;
 class SessionID;
 class SiteInstance;
 class SpellChecker;
 class TabContents;
 struct ThumbnailScore;
 class Task;
 class TemplateURL;
 class TemplateURLRef;
 class URLRequestContext;
 class UserScriptMaster;
 class VisitedLinkMaster;
 class WebContents;
-class WebPreferences;
 
 namespace IPC {
 class Message;
 }
 
 //---------------------------------------------------------------------------
 // These stubs are for Browser_main()
 
 // TODO(port): MessageWindow is very windows-specific, but provides the concept
 //             of singleton browser process per user-data-dir. Investigate how
@@ skipping 211 matching lines @@
 class BrokerServices {
  public:
   void Init() { NOTIMPLEMENTED(); }
 };
 
 }  // namespace sandbox
 
 class IconManager {
 };
 
-struct ViewHostMsg_DidPrintPage_Params;
-struct ViewHostMsg_FrameNavigate_Params;
+struct ViewHostMsg_Resource_Request;
 
 class ResourceDispatcherHost {
  public:
   explicit ResourceDispatcherHost(MessageLoop* loop) {}
 
   class Receiver {
    public:
     virtual bool Send(IPC::Message* message) = 0;
   };
   void OnClosePageACK(int, int);
@@ skipping 315 matching lines @@
   }
   void FileSelected(const std::wstring&) { NOTIMPLEMENTED(); }
   void MultiFilesSelected(const std::vector<std::wstring>&) {
     NOTIMPLEMENTED();
   }
   bool CreateRenderView() {
     NOTIMPLEMENTED();
     return true;
   }
   void SetAlternateErrorPageURL(const GURL&) { NOTIMPLEMENTED(); }
-  void UpdateWebPreferences(const WebPreferences&) { NOTIMPLEMENTED(); }
+  void UpdateWebPreferences(WebPreferences) { NOTIMPLEMENTED(); }
   void ReservePageIDRange(int) { NOTIMPLEMENTED(); }
 };
 
 class LoadNotificationDetails {
  public:
   LoadNotificationDetails(const GURL&, PageTransition::Type,
                           base::TimeDelta, NavigationController*, int) { }
 };
 
 class TabContents : public NotificationObserver {
@@ skipping 457 matching lines @@
     return L"";
   }
 };
 
 class SimpleAlertInfoBarDelegate : public InfoBarDelegate {
  public:
   SimpleAlertInfoBarDelegate(WebContents*, const std::wstring&, void*) {}
 };
 
 #endif  // CHROME_COMMON_TEMP_SCAFFOLDING_STUBS_H_