Changing SessionService to have a BaseSessionService, not being one.

chrome/browser/ui/browser_browsertest.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 <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 2188 matching lines @@
 // Tests to ensure that the browser continues running in the background after
 // the last window closes.
 class NoStartupWindowTest : public BrowserTest {
  public:
   NoStartupWindowTest() {}
 
   void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kNoStartupWindow);
     command_line->AppendSwitch(switches::kKeepAliveForTest);
   }
+
+  // Wait until the session backend has been initialized. Returns false if it
+  // failed to initialize.
+  bool WaitForBackendInitialized(BaseSessionService* base_session_service) {

[Mr4D (OOO till 08-26), 2014/11/03 22:05:50]

I think that a busy waiting for the thread initialization should suffice at this
point for this one test...

+    for (int i = 0; i < 1000; i++) {
+      if (base_session_service->BackendInitializedForTest())
+        return true;
+      base::MessageLoopForUI::current()->RunUntilIdle();
+      sleep(5);
+    }
+    NOTREACHED() << "Backend did not get initialized in 5 seconds.";
+    return false;
+  }
 };
 
 IN_PROC_BROWSER_TEST_F(NoStartupWindowTest, NoStartupWindowBasicTest) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // kNoStartupWindow doesn't make sense in Metro+Ash.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   // No browser window should be started by default.
@@ skipping 14 matching lines @@
 #if defined(OS_WIN) && defined(USE_ASH)
   // kNoStartupWindow doesn't make sense in Metro+Ash.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   Profile* profile = ProfileManager::GetActiveUserProfile();
 
   SessionService* session_service =
       SessionServiceFactory::GetForProfile(profile);
-  ASSERT_FALSE(session_service->processed_any_commands());
+
+  ASSERT_TRUE(WaitForBackendInitialized(
+                  session_service->GetBaseSessionServiceForTest()));
+
+  ASSERT_FALSE(session_service->GetBaseSessionServiceForTest()->
+                   ProcessedAnyCommandsForTest());
 
   ui_test_utils::BrowserAddedObserver browser_added_observer;
   CreateBrowserForApp("blah", profile);
   browser_added_observer.WaitForSingleNewBrowser();
 
-  ASSERT_FALSE(session_service->processed_any_commands());
+  ASSERT_FALSE(session_service->GetBaseSessionServiceForTest()->
+                   ProcessedAnyCommandsForTest());
 }
 #endif  // !defined(OS_CHROMEOS)
 
 // This test needs to be placed outside the anonymous namespace because we
 // need to access private type of Browser.
 class AppModeTest : public BrowserTest {
  public:
   AppModeTest() {}
 
   void SetUpCommandLine(CommandLine* command_line) override {
@@ skipping 381 matching lines @@
 #endif
   EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
   EXPECT_EQ(exp_commit_size, wcv_commit_size2);
   gfx::Size exp_final_size(initial_wcv_size);
   exp_final_size.Enlarge(wcv_resize_insets.width(),
                          wcv_resize_insets.height() + height_inset);
   EXPECT_EQ(exp_final_size,
             web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
   EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
 }