2 files changed, 15 insertions, 4 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index f45d593..d1dcd6a 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -678,7 +678,6 @@ if not env.Bit('windows'):
       'browser_accessibility_manager.cc',
       'browser_shutdown.cc',
       'browser_url_handler.cc',
-      'browsing_data_remover.cc',
       'chrome_plugin_host.cc',
       'dock_info.cc',
       'dom_ui/dom_ui_contents.cc',
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index 00f805b..7eb25e0 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -6,12 +6,9 @@
 
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/sessions/session_service.h"
-#include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/notification_service.h"
 #include "net/base/cookie_monster.h"
@@ -20,13 +17,28 @@
 #include "net/url_request/url_request_context.h"
 #include "webkit/glue/password_form.h"
 
+#if defined(OS_POSIX)
+// TODO(port): get rid of this include. It's used just to provide declarations
+// and stub definitions for classes we encouter during the porting effort.
+#include "chrome/common/temp_scaffolding_stubs.h"
+#endif
+
+// TODO(port): Get rid of this section and finish porting.
+#if defined(OS_WIN)
+#include "chrome/browser/download/download_manager.h"
+#include "chrome/browser/sessions/session_service.h"
+#include "chrome/browser/sessions/tab_restore_service.h"
+#endif
+
 using base::Time;
 
 // Done so that we can use invokeLater on BrowsingDataRemovers and not have
 // BrowsingDataRemover implement RefCounted.
+template<>
 void RunnableMethodTraits<BrowsingDataRemover>::RetainCallee(
     BrowsingDataRemover* remover) {
 }
+template<>
 void RunnableMethodTraits<BrowsingDataRemover>::ReleaseCallee(
     BrowsingDataRemover* remover) {
 }