Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/shell_integration_linux_unittest.cc

 // Copyright 2013 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/shell_integration_linux.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cstdlib>
 #include <map>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/scoped_path_override.h"
 #include "chrome/common/chrome_constants.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-using content::BrowserThread;
 using ::testing::ElementsAre;
 
 namespace shell_integration_linux {
 
 namespace {
 
 // Provides mock environment variables values based on a stored map.
 class MockEnvironment : public base::Environment {
  public:
   MockEnvironment() {}
@@ skipping 46 matching lines @@
   int bytes_written = base::WriteFile(path, str.data(), str.size());
   if (bytes_written < 0)
     return false;
 
   return static_cast<size_t>(bytes_written) == str.size();
 }
 
 }  // namespace
 
 TEST(ShellIntegrationTest, GetDataWriteLocation) {
-  base::MessageLoop message_loop;
-  content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop);
+  content::TestBrowserThreadBundle test_browser_thread_bundle;
 
   // Test that it returns $XDG_DATA_HOME.
   {
     MockEnvironment env;
     base::ScopedPathOverride home_override(base::DIR_HOME,
                                            base::FilePath("/home/user"),
                                            true /* absolute? */,
                                            false /* create? */);
     env.Set("XDG_DATA_HOME", "/user/path");
     base::FilePath path = GetDataWriteLocation(&env);
     EXPECT_EQ("/user/path", path.value());
   }
 
   // Test that $XDG_DATA_HOME falls back to $HOME/.local/share.
   {
     MockEnvironment env;
     base::ScopedPathOverride home_override(base::DIR_HOME,
                                            base::FilePath("/home/user"),
                                            true /* absolute? */,
                                            false /* create? */);
     base::FilePath path = GetDataWriteLocation(&env);
     EXPECT_EQ("/home/user/.local/share", path.value());
   }
 }
 
 TEST(ShellIntegrationTest, GetDataSearchLocations) {
-  base::MessageLoop message_loop;
-  content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop);
+  content::TestBrowserThreadBundle test_browser_thread_bundle;
 
   // Test that it returns $XDG_DATA_HOME + $XDG_DATA_DIRS.
   {
     MockEnvironment env;
     base::ScopedPathOverride home_override(base::DIR_HOME,
                                            base::FilePath("/home/user"),
                                            true /* absolute? */,
                                            false /* create? */);
     env.Set("XDG_DATA_HOME", "/user/path");
     env.Set("XDG_DATA_DIRS", "/system/path/1:/system/path/2");
@@ skipping 48 matching lines @@
   }
 }
 
 TEST(ShellIntegrationTest, GetExistingShortcutLocations) {
   base::FilePath kProfilePath("Profile 1");
   const char kExtensionId[] = "test_extension";
   const char kTemplateFilename[] = "chrome-test_extension-Profile_1.desktop";
   base::FilePath kTemplateFilepath(kTemplateFilename);
   const char kNoDisplayDesktopFile[] = "[Desktop Entry]\nNoDisplay=true";
 
-  base::MessageLoop message_loop;
-  content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop);
+  content::TestBrowserThreadBundle test_browser_thread_bundle;
 
   // No existing shortcuts.
   {
     MockEnvironment env;
     web_app::ShortcutLocations result =
         GetExistingShortcutLocations(&env, kProfilePath, kExtensionId);
     EXPECT_FALSE(result.on_desktop);
     EXPECT_EQ(web_app::APP_MENU_LOCATION_NONE,
               result.applications_menu_location);
 
@@ skipping 81 matching lines @@
     EXPECT_FALSE(result.in_quick_launch_bar);
   }
 }
 
 TEST(ShellIntegrationTest, GetExistingShortcutContents) {
   const char kTemplateFilename[] = "shortcut-test.desktop";
   base::FilePath kTemplateFilepath(kTemplateFilename);
   const char kTestData1[] = "a magical testing string";
   const char kTestData2[] = "a different testing string";
 
-  base::MessageLoop message_loop;
-  content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop);
+  content::TestBrowserThreadBundle test_browser_thread_bundle;
 
   // Test that it searches $XDG_DATA_HOME/applications.
   {
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
     MockEnvironment env;
     env.Set("XDG_DATA_HOME", temp_dir.GetPath().value());
     // Create a file in a non-applications directory. This should be ignored.
     ASSERT_TRUE(
@@ skipping 80 matching lines @@
   EXPECT_EQ(base::FilePath("chrome-extensionid-Profile_Name_.desktop"),
             GetExtensionShortcutFilename(kProfilePath, kExtensionId));
 }
 
 TEST(ShellIntegrationTest, GetExistingProfileShortcutFilenames) {
   base::FilePath kProfilePath("a/b/c/Profile Name?");
   const char kApp1Filename[] = "chrome-extension1-Profile_Name_.desktop";
   const char kApp2Filename[] = "chrome-extension2-Profile_Name_.desktop";
   const char kUnrelatedAppFilename[] = "chrome-extension-Other_Profile.desktop";
 
-  base::MessageLoop message_loop;
-  content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop);
+  content::TestBrowserThreadBundle test_browser_thread_bundle;
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   ASSERT_TRUE(WriteEmptyFile(temp_dir.GetPath().Append(kApp1Filename)));
   ASSERT_TRUE(WriteEmptyFile(temp_dir.GetPath().Append(kApp2Filename)));
   // This file should not be returned in the results.
   ASSERT_TRUE(WriteEmptyFile(temp_dir.GetPath().Append(kUnrelatedAppFilename)));
   std::vector<base::FilePath> paths =
       GetExistingProfileShortcutFilenames(kProfilePath, temp_dir.GetPath());
   // Path order is arbitrary. Sort the output for consistency.
@@ skipping 249 matching lines @@
   EXPECT_EQ("baR", internal::GetProgramClassClass(command_line, "foo.desktop"));
 
   command_line = base::CommandLine(base::FilePath());
   command_line.AppendSwitchASCII("user-data-dir", "/tmp/baz");
   EXPECT_EQ("foo (/tmp/baz)",
             internal::GetProgramClassName(command_line, "foo.desktop"));
   EXPECT_EQ("Foo", internal::GetProgramClassClass(command_line, "foo.desktop"));
 }
 
 }  // namespace shell_integration_linux