Extract locking behaviour from ProcessSingleton.

chrome_frame/test/net/fake_external_tab.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_frame/test/net/fake_external_tab.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <exdisp.h>
 #include <Winsock2.h>
@@ skipping 773 matching lines @@
 int CFUrlRequestUnittestRunner::PreCreateThreads() {
   fake_chrome_.reset(new FakeExternalTab());
   fake_chrome_->Initialize();
   fake_chrome_->browser_process()->PreCreateThreads();
   ProcessSingleton::NotificationCallback callback(
       base::Bind(
           &CFUrlRequestUnittestRunner::ProcessSingletonNotificationCallback,
           base::Unretained(this)));
   process_singleton_.reset(new ProcessSingleton(fake_chrome_->user_data(),
                                                 callback));
-  process_singleton_->Lock(NULL);
   return 0;
 }
 
 bool CFUrlRequestUnittestRunner::ProcessSingletonNotificationCallback(
     const CommandLine& command_line, const base::FilePath& current_directory) {
   std::string channel_id = command_line.GetSwitchValueASCII(
       switches::kAutomationClientChannelID);
   EXPECT_FALSE(channel_id.empty());
 
   Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile(
@@ skipping 10 matching lines @@
   fake_chrome_->InitializePostThreadsCreated();
   // Call Create directly instead of NotifyOtherProcessOrCreate as failure is
   // prefered to notifying another process here.
   if (!process_singleton_->Create()) {
     LOG(FATAL) << "Failed to start up ProcessSingleton. Is another test "
                << "executable or Chrome Frame running?";
     if (crash_service_)
       base::KillProcess(crash_service_, 0, false);
     ::ExitProcess(1);
   }
-
-  StartChromeFrameInHostBrowser();
 }
 
 bool CFUrlRequestUnittestRunner::MainMessageLoopRun(int* result_code) {
   DCHECK(MessageLoop::current());
   DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
 
   // We need to allow IO on the main thread for these tests.
   base::ThreadRestrictions::SetIOAllowed(true);
-  process_singleton_->Unlock();
+  StartChromeFrameInHostBrowser();
   StartInitializationTimeout();
   return false;
 }
 
 void CFUrlRequestUnittestRunner::PostMainMessageLoopRun() {
   process_singleton_->Cleanup();
   fake_chrome_->browser_process()->StartTearDown();
 
   // Must do this separately as the mock profile_manager_ is not the
   // same member as BrowserProcessImpl::StartTearDown resets.
@@ skipping 125 matching lines @@
   content::InitializeSandboxInfo(&sandbox_info);
   FakeMainDelegate delegate;
   content::ContentMain(
       reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
       &sandbox_info,
       &delegate);
 
   // Note:  In debug builds, we ExitProcess during PostDestroyThreads.
   return g_test_suite->test_result();
 }