Make base_session_service.cc compile on Posix.

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

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

8 files changed, 17 insertions, 113 deletions

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index f8c17b9..8f5b1ab 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -744,7 +744,6 @@ if not env.Bit('windows'):
       'safe_browsing/safe_browsing_blocking_page.cc',
       'sandbox_policy.cc',
       'search_engines/template_url_fetcher.cc',
-      'sessions/base_session_service.cc',
       'shell_integration.cc',
       'tab_contents/interstitial_page.cc',
       'tab_contents/native_ui_contents.cc',
diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc
index 5ab3282..48fd901 100644
--- a/chrome/browser/sessions/base_session_service.cc
+++ b/chrome/browser/sessions/base_session_service.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
+
 #include "chrome/browser/sessions/base_session_service.h"
 
 #include "base/pickle.h"
@@ -11,9 +13,13 @@
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/stl_util-inl.h"
 
+// TODO(port): Get rid of this section and finish porting.
+#if defined(OS_WIN)
+#include "chrome/browser/tab_contents/tab_contents.h"
+#endif
+
 // InternalGetCommandsRequest -------------------------------------------------
 
 BaseSessionService::InternalGetCommandsRequest::~InternalGetCommandsRequest() {
@@ -65,7 +71,9 @@ BaseSessionService::BaseSessionService(SessionType type,
     : profile_(profile),
       path_(path),
       backend_thread_(NULL),
+#if defined(OS_WIN)
 #pragma warning(suppress: 4355)  // Okay to pass "this" here.
+#endif
       save_factory_(this),
       pending_reset_(false),
       commands_since_reset_(0) {
diff --git a/chrome/browser/sessions/base_session_service.h b/chrome/browser/sessions/base_session_service.h
index b6e69e1..6e05094 100644
--- a/chrome/browser/sessions/base_session_service.h
+++ b/chrome/browser/sessions/base_session_service.h
@@ -64,7 +64,7 @@ class BaseSessionService : public CancelableRequestProvider,
       public CancelableRequest<InternalGetCommandsCallback> {
    public:
     explicit InternalGetCommandsRequest(CallbackType* callback)
-        : CancelableRequest(callback) {
+        : CancelableRequest<InternalGetCommandsCallback>(callback) {
     }
     virtual ~InternalGetCommandsRequest();
 
diff --git a/chrome/browser/sessions/session_backend.h b/chrome/browser/sessions/session_backend.h
index 5535cb2..496a3ec 100644
--- a/chrome/browser/sessions/session_backend.h
+++ b/chrome/browser/sessions/session_backend.h
@@ -9,16 +9,10 @@
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "chrome/browser/sessions/base_session_service.h"
 #include "chrome/browser/sessions/session_command.h"
 #include "net/base/file_stream.h"
 
-// TODO(port): Get rid of this section and finish porting.
-#if defined(OS_WIN)
-#include "chrome/browser/sessions/base_session_service.h"
-#else
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
-
 class Pickle;
 
 // SessionBackend -------------------------------------------------------------
diff --git a/chrome/browser/sessions/session_service.h b/chrome/browser/sessions/session_service.h
index 6a0e63a..577981d 100644
--- a/chrome/browser/sessions/session_service.h
+++ b/chrome/browser/sessions/session_service.h
@@ -9,21 +9,11 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/sessions/base_session_service.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.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/sessions/base_session_service.h"
-#endif
-
 class Browser;
 class NavigationController;
 class NavigationEntry;
diff --git a/chrome/browser/sessions/tab_restore_service.h b/chrome/browser/sessions/tab_restore_service.h
index 2391224..2962cf5 100644
--- a/chrome/browser/sessions/tab_restore_service.h
+++ b/chrome/browser/sessions/tab_restore_service.h
@@ -10,20 +10,10 @@
 
 #include "base/observer_list.h"
 #include "base/time.h"
+#include "chrome/browser/sessions/base_session_service.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/session_types.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/sessions/base_session_service.h"
-#endif
-
 class Browser;
 class NavigationController;
 class Profile;
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index 3e4886d..49271e6 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -294,6 +294,7 @@
 		9E85B39CA40439D93CE52E60 /* fav_icon_helper.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8760E9D4839009A6919 /* fav_icon_helper.cc */; };
 		A0BC9272AD709E86D492DAEC /* bookmark_storage.cc in Sources */ = {isa = PBXBuildFile; fileRef = D941DBEFD8B8B537DE8A4DAE /* bookmark_storage.cc */; };
 		A0EB956531B9DB1E40DAE980 /* user_script_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 37521A11B07C479E93A39D52 /* user_script_unittest.cc */; };
+		A146CA143D6DE43AF768CF47 /* base_session_service.cc in Sources */ = {isa = PBXBuildFile; fileRef = 05C9D404FC8116984CCCEDED /* base_session_service.cc */; };
 		A54612DC0EE9958600A8EE5D /* extensions_service_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = A54612DB0EE9958600A8EE5D /* extensions_service_unittest.cc */; };
 		A54612E20EE995F600A8EE5D /* extensions_service.cc in Sources */ = {isa = PBXBuildFile; fileRef = A54612D90EE9957000A8EE5D /* extensions_service.cc */; };
 		A572828F0F31156100384E1B /* unzip_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = E45076E80F153B06003BE099 /* unzip_unittest.cc */; };
@@ -1815,6 +1816,7 @@
 /* Begin PBXFileReference section */
 		0082A7510F16987A000AA0EF /* user_script_master.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_script_master.cc; sourceTree = "<group>"; };
 		0082A7520F16987A000AA0EF /* user_script_master.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = user_script_master.h; sourceTree = "<group>"; };
+		05C9D404FC8116984CCCEDED /* base_session_service.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = base_session_service.cc; path = browser/sessions/base_session_service.cc; sourceTree = SOURCE_ROOT; };
 		0B7CC9C105E90E0665852528 /* url_fetcher_protect.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url_fetcher_protect.cc; sourceTree = "<group>"; };
 		269003C4E493789D82B6B0F9 /* history_publisher.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = history_publisher.cc; sourceTree = "<group>"; };
 		26D97CE692D919FEB1521E43 /* ssl_error_info.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ssl_error_info.cc; path = ssl/ssl_error_info.cc; sourceTree = "<group>"; };
@@ -3095,6 +3097,7 @@
 				3C56D1B8B7580A18DB8FE677 /* ssl_host_state.h */,
 				35AC9D9A03545594C102C5C1 /* session_backend.cc */,
 				C3F9577C67188A5A4E3A6E41 /* session_restore.cc */,
+				05C9D404FC8116984CCCEDED /* base_session_service.cc */,
 			);
 			sourceTree = "<group>";
 		};
@@ -5313,6 +5316,7 @@
 				E434BFD90F3A074300B665C7 /* backing_store.cc in Sources */,
 				671555F7DF06E224B646E5D2 /* backing_store_posix.cc in Sources */,
 				E40CC5EE0F2E34C100708647 /* base_history_model.cc in Sources */,
+				A146CA143D6DE43AF768CF47 /* base_session_service.cc in Sources */,
 				4D7BFAEE0E9D49E5009A6919 /* bloom_filter.cc in Sources */,
 				E45075B20F1505C0003BE099 /* bookmark_codec.cc in Sources */,
 				E40CC5F20F2E34EE00708647 /* bookmark_folder_tree_model.cc in Sources */,
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 27cfc32..d49aa50 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -180,87 +180,6 @@ class UserDataManager {
   static UserDataManager* instance_;
 };
 
-class BaseSessionService : public CancelableRequestProvider,
-    public base::RefCountedThreadSafe<BaseSessionService> {
- public:
-  enum SessionType {
-    SESSION_RESTORE,
-    TAB_RESTORE
-  };
-  BaseSessionService() { NOTIMPLEMENTED(); }
-  BaseSessionService(SessionType type,
-                     Profile* profile,
-                     const FilePath& path) {
-    NOTIMPLEMENTED();
-  }
-  Profile* profile() const { NOTIMPLEMENTED(); return NULL; }
-  void DeleteLastSession() { NOTIMPLEMENTED(); }
-  class InternalGetCommandsRequest;
-  typedef Callback2<Handle, scoped_refptr<InternalGetCommandsRequest> >::Type
-      InternalGetCommandsCallback;
-  class InternalGetCommandsRequest :
-      public CancelableRequest<InternalGetCommandsCallback> {
-   public:
-    explicit InternalGetCommandsRequest(CallbackType* callback)
-      : CancelableRequest<InternalGetCommandsCallback>(callback) {
-    }
-    virtual ~InternalGetCommandsRequest() { }
-    std::vector<SessionCommand*> commands;
-   private:
-    DISALLOW_COPY_AND_ASSIGN(InternalGetCommandsRequest);
-  };
- protected:
-  SessionBackend* backend() const {
-    NOTIMPLEMENTED();
-    return NULL;
-  }
-  base::Thread* backend_thread() const {
-    NOTIMPLEMENTED();
-    return NULL;
-  }
-  std::vector<SessionCommand*>&  pending_commands() {
-    NOTIMPLEMENTED();
-    return pending_commands_;
-  }
-  void set_pending_reset(bool value) { NOTIMPLEMENTED(); }
-  bool pending_reset() const { NOTIMPLEMENTED(); return false; }
-  int commands_since_reset() const { NOTIMPLEMENTED(); return 0; }
-  virtual void ScheduleCommand(SessionCommand* command) { NOTIMPLEMENTED(); }
-  void StartSaveTimer() { NOTIMPLEMENTED(); }
-  virtual void Save() { NOTIMPLEMENTED(); }
-  SessionCommand* CreateUpdateTabNavigationCommand(
-      SessionID::id_type command_id,
-      SessionID::id_type tab_id,
-      int index,
-      const NavigationEntry& entry) {
-    NOTIMPLEMENTED();
-    return NULL;
-  }
-  bool RestoreUpdateTabNavigationCommand(const SessionCommand& command,
-                                         TabNavigation* navigation,
-                                         SessionID::id_type* tab_id) {
-    NOTIMPLEMENTED();
-    return false;
-  }
-  bool ShouldTrackEntry(const NavigationEntry& entry) {
-    NOTIMPLEMENTED();
-    return false;
-  }
-  bool ShouldTrackEntry(const TabNavigation& navigation) {
-    NOTIMPLEMENTED();
-    return false;
-  }
-  Handle ScheduleGetLastSessionCommands(
-      InternalGetCommandsRequest* request,
-      CancelableRequestConsumerBase* consumer) {
-    NOTIMPLEMENTED();
-    return 0;
-  }
-  static const int max_persist_navigation_count = 6;
- private:
-   std::vector<SessionCommand*> pending_commands_;
-};
-
 namespace browser {
 void RegisterAllPrefs(PrefService*, PrefService*);
 }