Make browsing_data_remover.cc compile on Mac and Linux.

Review URL: http://codereview.chromium.org/21232

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9533 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 49 insertions, 6 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) {
 }
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index 44e3a1f..bfafa48 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -328,6 +328,7 @@
 		BA60A6800F3CB09F005A6703 /* protocol_manager_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFAD70E9D49DE009A6919 /* protocol_manager_unittest.cc */; };
 		BAA609ED0F3BCAA800783510 /* protocol_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFAD50E9D49DE009A6919 /* protocol_manager.cc */; };
 		BADB8B710F3A35AC00989B26 /* resource_dispatcher_host.cc in Sources */ = {isa = PBXBuildFile; fileRef = BADB8B6D0F3A356000989B26 /* resource_dispatcher_host.cc */; };
+		DDB41CECE38B852000F30D9F /* browsing_data_remover.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF84E0E9D4839009A6919 /* browsing_data_remover.cc */; };
 		E40CC5E30F2E348900708647 /* history_contents_provider.cc in Sources */ = {isa = PBXBuildFile; fileRef = E40CC5E10F2E348900708647 /* history_contents_provider.cc */; };
 		E40CC5EE0F2E34C100708647 /* base_history_model.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF82B0E9D4839009A6919 /* base_history_model.cc */; };
 		E40CC5F20F2E34EE00708647 /* bookmark_folder_tree_model.cc in Sources */ = {isa = PBXBuildFile; fileRef = E40CC5F00F2E34EE00708647 /* bookmark_folder_tree_model.cc */; };
@@ -5147,6 +5148,7 @@
 				E48B68640F2637B6002E47EC /* browser_window_cocoa.mm in Sources */,
 				E48B68570F26330C002E47EC /* browser_window_controller.mm in Sources */,
 				E48B684D0F2630D3002E47EC /* browser_window_factory.mm in Sources */,
+				DDB41CECE38B852000F30D9F /* browsing_data_remover.cc in Sources */,
 				E434BBD00F37D93C00B665C7 /* browsing_instance.cc in Sources */,
 				E45075E20F150A6F003BE099 /* buffered_resource_handler.cc in Sources */,
 				475CAF858604B413561740C1 /* cache_manager_host.cc in Sources */,
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index eabcc34..7e5df3b 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -46,6 +46,7 @@
 
 class Browser;
 class BookmarkService;
+class CancelableRequestConsumerBase;
 class CommandLine;
 class ConstrainedWindow;
 class DOMUIHost;
@@ -165,7 +166,23 @@ class UserDataManager {
   static UserDataManager* instance_;
 };
 
-class SessionService : public base::RefCountedThreadSafe<SessionService> {
+class BaseSessionService
+    : public base::RefCountedThreadSafe<BaseSessionService> {
+ public:
+  enum SessionType {
+    SESSION_RESTORE,
+    TAB_RESTORE
+  };
+  BaseSessionService() { NOTIMPLEMENTED(); }
+  BaseSessionService(SessionType type,
+                     Profile* profile,
+                     const std::wstring& path) {
+    NOTIMPLEMENTED();
+  }
+  void DeleteLastSession() { NOTIMPLEMENTED(); }
+};
+
+class SessionService : public BaseSessionService {
  public:
   explicit SessionService(Profile* profile) { }
   void WindowClosed(const SessionID &) { NOTIMPLEMENTED(); }
@@ -195,11 +212,12 @@ class SessionRestore {
   static size_t num_tabs_to_load_;
 };
 
-class TabRestoreService : public base::RefCountedThreadSafe<TabRestoreService> {
+class TabRestoreService : public BaseSessionService {
  public:
   explicit TabRestoreService(Profile* profile) { }
   void BrowserClosing(Browser*) { NOTIMPLEMENTED(); }
   void BrowserClosed(Browser*) { NOTIMPLEMENTED(); }
+  void ClearEntries() { NOTIMPLEMENTED(); }
   void CreateHistoricalTab(NavigationController*) { NOTIMPLEMENTED(); }
   void RestoreMostRecentEntry(Browser*) { NOTIMPLEMENTED(); }
 };
@@ -269,6 +287,12 @@ class HistoryService {
   void SetPageTitle(const GURL&, const std::wstring&) {
     NOTIMPLEMENTED();
   }
+  typedef Callback0::Type ExpireHistoryCallback;
+  void ExpireHistoryBetween(base::Time begin_time, base::Time end_time,
+                            CancelableRequestConsumerBase* consumer,
+                            ExpireHistoryCallback* callback) {
+    NOTIMPLEMENTED();
+  }
 
   scoped_refptr<history::HistoryBackend> history_backend_;
 };
@@ -781,6 +805,12 @@ class DownloadManager : public base::RefCountedThreadSafe<DownloadManager> {
   }
   void DownloadUrl(const GURL& url, const GURL& referrer,
                    WebContents* web_contents) { NOTIMPLEMENTED(); }
+  int RemoveDownloadsBetween(const base::Time remove_begin,
+                             const base::Time remove_end) {
+    NOTIMPLEMENTED();
+    return 0;
+  }
+  void ClearLastDownloadPath() { NOTIMPLEMENTED(); }
   int in_progress_count() {
     NOTIMPLEMENTED();
     return 0;