6 files changed, 26 insertions, 105 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_state_controller.mm b/chrome/browser/cocoa/bookmark_bar_state_controller.mm
index 77d0625..e4c6525 100644
--- a/chrome/browser/cocoa/bookmark_bar_state_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_state_controller.mm
@@ -5,6 +5,8 @@
 #import "chrome/browser/cocoa/bookmark_bar_state_controller.h"
 #import "chrome/browser/bookmarks/bookmark_utils.h"
 #import "chrome/browser/browser.h"
+#import "chrome/common/pref_names.h"
+#import "chrome/common/pref_service.h"
 
 
 @implementation BookmarkBarStateController
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 031d626..7e0e81e 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -32,6 +32,8 @@
 #include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/controls/button/text_button.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 807e457..2082c0c 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -27,7 +27,9 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_helper.h"
+#include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/renderer_security_policy.h"
 #include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
diff --git a/chrome/browser/tab_contents/web_contents_view_mac.mm b/chrome/browser/tab_contents/web_contents_view_mac.mm
index d36e10b..758e04f 100644
--- a/chrome/browser/tab_contents/web_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/web_contents_view_mac.mm
@@ -10,6 +10,7 @@
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 #include "chrome/browser/tab_contents/render_view_context_menu_mac.h"
 #include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/common/notification_type.h"
 
 #include "chrome/common/temp_scaffolding_stubs.h"
 
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index ed1083c..a42cc96 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -8,42 +8,22 @@
 
 #include <vector>
 
-#include "base/file_util.h"
 #include "base/logging.h"
-#include "base/thread.h"
-#include "base/path_service.h"
-#include "base/string_piece.h"
-#include "base/singleton.h"
-#include "base/task.h"
-#include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/automation/automation_provider.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/browser_shutdown.h"
-#include "chrome/browser/debugger/debugger_shell.h"
-#include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/download/download_request_dialog_delegate.h"
 #include "chrome/browser/download/download_request_manager.h"
 #include "chrome/browser/first_run.h"
-#include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/memory_details.h"
-#include "chrome/browser/profile_manager.h"
-#include "chrome/browser/renderer_host/render_widget_helper.h"
-#include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/browser/rlz/rlz.h"
-#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/shell_integration.h"
-#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_plugin_util.h"
-#include "chrome/common/gfx/chrome_font.h"
-#include "chrome/common/gfx/text_elider.h"
-#include "chrome/common/notification_service.h"
-#include "chrome/common/pref_service.h"
 #include "chrome/common/process_watcher.h"
-#include "net/url_request/url_request_context.h"
-#include "webkit/glue/webcursor.h"
-#include "webkit/glue/webkit_glue.h"
+
+#if defined(OS_MACOSX)
+#include "chrome/browser/download/download_item_model.h"
+#include "chrome/browser/download/download_shelf.h"
+#endif
+
+class TabContents;
 
 //--------------------------------------------------------------------------
 
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 59f4d30..12c05a6 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -9,110 +9,41 @@
 // 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 <list>
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/clipboard.h"
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/string16.h"
 #include "base/gfx/native_widget_types.h"
-#include "base/gfx/rect.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/download/download_shelf.h"
-#include "chrome/browser/download/save_types.h"
-#include "chrome/browser/history/download_types.h"
-#include "chrome/browser/history/history.h"
-#include "chrome/browser/renderer_host/resource_handler.h"
-#include "chrome/browser/safe_browsing/safe_browsing_util.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
-#include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/sessions/session_id.h"
-#include "chrome/browser/ssl/ssl_error_info.h"
-#include "chrome/browser/ssl/ssl_manager.h"
-#include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/tab_contents/page_navigator.h"
-#include "chrome/browser/tab_contents/tab_contents_type.h"
-#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/renderer_host/render_widget_host.h"
-#include "chrome/browser/renderer_host/render_view_host_delegate.h"
-#include "chrome/common/child_process_info.h"
-#include "chrome/common/navigation_types.h"
-#include "chrome/common/notification_service.h"
-#include "chrome/common/page_transition_types.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/common/pref_service.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/load_states.h"
 #include "skia/include/SkBitmap.h"
-#include "webkit/glue/password_form.h"
-#include "webkit/glue/webplugin.h"
-#include "webkit/glue/window_open_disposition.h"
 
 class BookmarkContextMenu;
+class BookmarkNode;
 class Browser;
 class CommandLine;
-class CPCommandInterface;
-class DOMUIHost;
 class DownloadItem;
-class DownloadManager;
-class HistoryService;
-class LoginHandler;
-class MetricsService;
-class MixedContentHandler;
-class ModalHtmlDialogDelegate;
+class MessageLoop;
 class NavigationController;
-class NavigationEntry;
-class NotificationService;
-class PluginService;
-class ProfileManager;
 class Profile;
-class RenderProcessHost;
-class RenderWidgetHelper;
 class RenderViewHostDelegate;
-class ResourceMessageFilter;
-class SessionBackend;
-class SessionCommand;
-class SessionID;
-class SiteInstance;
-class SpellChecker;
-class TabContentsDelegate;
-class TabContentsFactory;
-class TabNavigation;
-struct ThumbnailScore;
-class Task;
-class TemplateURL;
-class TemplateURLRef;
 class URLRequest;
-class URLRequestContext;
-class UserScriptMaster;
-class VisitedLinkMaster;
 class WebContents;
-class WebContentsView;
-struct WebPluginGeometry;
-class WebPreferences;
+struct ViewHostMsg_DidPrintPage_Params;
 
-namespace base {
-class Thread;
+namespace gfx {
+class Rect;
 }
 
 namespace IPC {
 class Message;
 }
 
-namespace net {
-class AuthChallengeInfo;
-class IOBuffer;
-class X509Certificate;
-}
-
 //---------------------------------------------------------------------------
 // These stubs are for Browser_main()
 
@@ -473,10 +404,6 @@ class WindowSizer {
 //---------------------------------------------------------------------------
 // These stubs are for Profile
 
-namespace base {
-class SharedMemory;
-}
-
 class Encryptor {
  public:
   static bool EncryptString16(const string16& plaintext,
@@ -546,6 +473,9 @@ class HtmlDialogContents {
 };
 
 #if defined(OS_MACOSX)
+
+class WebContentsView;
+
 class FindBarMac {
  public:
   FindBarMac(WebContentsView*, gfx::NativeWindow) { }
@@ -572,6 +502,10 @@ class LoginHandler {
   void OnRequestCancelled() { NOTIMPLEMENTED(); }
 };
 
+namespace net {
+class AuthChallengeInfo;
+}
+
 LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info,
                                 URLRequest* request,
                                 MessageLoop* ui_loop);