Remove BrowserThread::UnsafeGetBrowserThread, add UnsafeGetMessageLoopForThread.

chrome/browser/sessions/base_session_service.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SESSIONS_BASE_SESSION_SERVICE_H_
 #define CHROME_BROWSER_SESSIONS_BASE_SESSION_SERVICE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/location.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "content/browser/cancelable_request.h"
 #include "googleurl/src/gurl.h"
 
 class NavigationEntry;
 class Profile;
 class SessionBackend;
 class SessionCommand;
 class TabNavigation;
 
-namespace base {
-class Thread;
-}
-
 // BaseSessionService is the super class of both tab restore service and
 // session service. It contains commonality needed by both, in particular
 // it manages a set of SessionCommands that are periodically sent to a
 // SessionBackend.
 class BaseSessionService : public CancelableRequestProvider,
                            public ProfileKeyedService {
  public:
   // Identifies the type of session service this is. This is used by the
   // backend to determine the name of the files.
   enum SessionType {
@@ skipping 39 matching lines @@
    private:
     DISALLOW_COPY_AND_ASSIGN(InternalGetCommandsRequest);
   };
 
  protected:
   virtual ~BaseSessionService();
 
   // Returns the backend.
   SessionBackend* backend() const { return backend_; }
 
-  // Returns the thread the backend runs on. This returns NULL during testing.
-  base::Thread* backend_thread() const { return backend_thread_; }
-
   // Returns the set of commands that needed to be scheduled. The commands
   // in the vector are owned by BaseSessionService, until they are scheduled
   // on the backend at which point the backend owns the commands.
   std::vector<SessionCommand*>&  pending_commands() {
     return pending_commands_;
   }
 
   // Whether the next save resets the file before writing to it.
   void set_pending_reset(bool value) { pending_reset_ = value; }
   bool pending_reset() const { return pending_reset_; }
@@ skipping 49 matching lines @@
   Handle ScheduleGetLastSessionCommands(
       InternalGetCommandsRequest* request,
       CancelableRequestConsumerBase* consumer);
 
   // Invokes ReadCurrentSessionCommands with request on the backend thread.
   // If testing, ReadLastSessionCommands is invoked directly.
   Handle ScheduleGetCurrentSessionCommands(
       InternalGetCommandsRequest* request,
       CancelableRequestConsumerBase* consumer);
 
+  // In production, this posts the task to the FILE thread.  For
+  // tests, it immediately runs the specified task on the current
+  // thread.
+  bool RunTaskOnBackendThread(const tracked_objects::Location& from_here,
+                              const base::Closure& task);
+
   // Max number of navigation entries in each direction we'll persist.
   static const int max_persist_navigation_count;
 
  private:
   // The profile. This may be null during testing.
   Profile* profile_;
 
   // Path to read from. This is only used if profile_ is NULL.
   const FilePath& path_;
 
   // The backend.
   scoped_refptr<SessionBackend> backend_;
 
-  // Thread backend tasks are run on, is NULL during testing.
-  base::Thread* backend_thread_;
-
   // Used to invoke Save.
   base::WeakPtrFactory<BaseSessionService> weak_factory_;
 
   // Commands we need to send over to the backend.
   std::vector<SessionCommand*>  pending_commands_;
 
   // Whether the backend file should be recreated the next time we send
   // over the commands.
   bool pending_reset_;
 
   // The number of commands sent to the backend before doing a reset.
   int commands_since_reset_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseSessionService);
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_BASE_SESSION_SERVICE_H_