Fix: service processes started before chrome prevented session restore from working.

chrome/browser/sessions/base_session_service.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/sessions/base_session_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/pickle.h"
 #include "base/stl_util.h"
@@ skipping 69 matching lines @@
   if (profile) {
     // We should never be created when incognito.
     DCHECK(!profile->IsOffTheRecord());
     const CommandLine* command_line = CommandLine::ForCurrentProcess();
     save_post_data_ =
         !command_line->HasSwitch(switches::kDisableRestoreSessionState);
   }
   backend_ = new SessionBackend(type, profile_ ? profile_->GetPath() : path);
   DCHECK(backend_.get());
 
-  RunTaskOnBackendThread(FROM_HERE,
-                         base::Bind(&SessionBackend::Init, backend_));
+  // SessionBackend::Init() cannot be scheduled to be called here. There are
+  // service processes which create the BaseSessionService, but they should not
+  // initialize the backend. If they do, the backend will cycle the session
+  // restore files. That in turn prevents the session restore from working when
+  // the normal chromium process is launched. Normally, the backend will be
+  // initialized before it's actually used. However, if we're running as a part
+  // of a test, it must be initialized now.
+  if (!RunningInProduction())
+    backend_->Init();
 }
 
 BaseSessionService::~BaseSessionService() {
 }
 
 void BaseSessionService::DeleteLastSession() {
   RunTaskOnBackendThread(
       FROM_HERE,
       base::Bind(&SessionBackend::DeleteLastSession, backend()));
 }
@@ skipping 271 matching lines @@
   if (profile_ && BrowserThread::IsMessageLoopValid(BrowserThread::FILE)) {
     return BrowserThread::PostTask(BrowserThread::FILE, from_here, task);
   } else {
     // Fall back to executing on the main thread if the file thread
     // has gone away (around shutdown time) or if we're running as
     // part of a unit test that does not set profile_.
     task.Run();
     return true;
   }
 }
+
+bool BaseSessionService::RunningInProduction() const {
+  return profile_ && BrowserThread::IsMessageLoopValid(BrowserThread::FILE);
+}