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

5 files changed, 13 insertions, 31 deletions

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;