Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/process_singleton_posix_unittest.cc

 // Copyright 2014 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/process_singleton.h"
 
 #include <fcntl.h>
 #include <limits.h>
 #include <signal.h>
 #include <stddef.h>
@@ skipping 14 matching lines @@
 #include "base/location.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/test/thread_test_helper.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/network_interfaces.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace {
 
 class ProcessSingletonPosixTest : public testing::Test {
  public:
   // A ProcessSingleton exposing some protected methods for testing.
@@ skipping 15 matching lines @@
    private:
     bool NotificationCallback(const base::CommandLine& command_line,
                               const base::FilePath& current_directory) {
       callback_command_lines_.push_back(command_line.argv());
       return true;
     }
   };
 
   ProcessSingletonPosixTest()
       : kill_callbacks_(0),
-        io_thread_(BrowserThread::IO),
+        test_browser_thread_bundle_(
+            content::TestBrowserThreadBundle::REAL_IO_THREAD),
         wait_event_(base::WaitableEvent::ResetPolicy::MANUAL,
                     base::WaitableEvent::InitialState::NOT_SIGNALED),
         signal_event_(base::WaitableEvent::ResetPolicy::MANUAL,
                       base::WaitableEvent::InitialState::NOT_SIGNALED),
-        process_singleton_on_thread_(NULL) {
-    io_thread_.StartIOThread();
-  }
+        process_singleton_on_thread_(NULL) {}
 
   void SetUp() override {
     testing::Test::SetUp();
 
     ProcessSingleton::DisablePromptForTesting();
     // Put the lock in a temporary directory.  Doesn't need to be a
     // full profile to test this code.
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     // Use a long directory name to ensure that the socket isn't opened through
     // the symlink.
@@ skipping 17 matching lines @@
       worker_thread_->task_runner()->PostTask(
           FROM_HERE,
           base::BindOnce(&ProcessSingletonPosixTest::DestructProcessSingleton,
                          base::Unretained(this)));
 
       scoped_refptr<base::ThreadTestHelper> helper(
           new base::ThreadTestHelper(worker_thread_->task_runner().get()));
       ASSERT_TRUE(helper->Run());
     }
 
-    io_thread_.Stop();
     testing::Test::TearDown();
   }
 
   void CreateProcessSingletonOnThread() {
     ASSERT_EQ(NULL, worker_thread_.get());
     worker_thread_.reset(new base::Thread("BlockingThread"));
     worker_thread_->Start();
 
     worker_thread_->task_runner()->PostTask(
         FROM_HERE,
@@ skipping 124 matching lines @@
 
   void DestructProcessSingleton() {
     ASSERT_TRUE(process_singleton_on_thread_);
     delete process_singleton_on_thread_;
   }
 
   void KillCallback(int pid) {
     kill_callbacks_++;
   }
 
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
   base::ScopedTempDir temp_dir_;
   base::WaitableEvent wait_event_;
   base::WaitableEvent signal_event_;
 
   std::unique_ptr<base::Thread> worker_thread_;
   TestableProcessSingleton* process_singleton_on_thread_;
 };
 
 }  // namespace
 
@@ skipping 173 matching lines @@
 // Test that if there is an existing lock file, and it's not locked, we replace
 // it.
 TEST_F(ProcessSingletonPosixTest, CreateReplacesOldMacLock) {
   std::unique_ptr<TestableProcessSingleton> process_singleton(
       CreateProcessSingleton());
   EXPECT_EQ(0, base::WriteFile(lock_path_, "", 0));
   EXPECT_TRUE(process_singleton->Create());
   VerifyFiles();
 }
 #endif  // defined(OS_MACOSX)