GTTF: Use a fresh TestingBrowserProcess for each test, part #6

For a detailed description see part #1, http://codereview.chromium.org/6478005/

This CL fixes the bug fully on Linux. More platforms will follow.

BUG=61062
TEST=unit_tests, possibly more

Review URL: http://codereview.chromium.org/7628006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96638 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 36 insertions, 19 deletions

diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
index 0fffd41..78d2878 100644
--- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
@@ -8,6 +8,7 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -24,7 +25,7 @@ InputMethodDescriptor GetDesc(const std::string& id,
 }
 }  // namespace
 
-class InputMethodUtilTest : public testing::Test {
+class InputMethodUtilTest : public TestingBrowserProcessTest {
  public:
   static void SetUpTestCase() {
     // Reload the internal maps before running tests, with the stub
diff --git a/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc b/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc
index 479d4448..a75b7ac 100644
--- a/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc
+++ b/chrome/browser/chromeos/login/cookie_fetcher_unittest.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/chromeos/login/issue_response_handler.h"
 #include "chrome/browser/chromeos/login/mock_auth_response_handler.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/url_fetcher.h"
@@ -25,7 +26,7 @@ using ::testing::Invoke;
 using ::testing::Unused;
 using ::testing::_;
 
-class CookieFetcherTest : public ::testing::Test {
+class CookieFetcherTest : public TestingBrowserProcessTest {
  public:
   CookieFetcherTest()
       : iat_url_(GaiaUrls::GetInstance()->issue_auth_token_url()),
diff --git a/chrome/browser/chromeos/login/google_authenticator_unittest.cc b/chrome/browser/chromeos/login/google_authenticator_unittest.cc
index 317b2aa..b3a9cae 100644
--- a/chrome/browser/chromeos/login/google_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/google_authenticator_unittest.cc
@@ -26,6 +26,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher_unittest.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/url_fetcher.h"
@@ -50,7 +51,7 @@ using ::testing::_;
 
 namespace chromeos {
 
-class GoogleAuthenticatorTest : public ::testing::Test {
+class GoogleAuthenticatorTest : public TestingBrowserProcessTest {
  public:
   GoogleAuthenticatorTest()
       : message_loop_ui_(MessageLoop::TYPE_UI),
diff --git a/chrome/browser/chromeos/login/online_attempt_unittest.cc b/chrome/browser/chromeos/login/online_attempt_unittest.cc
index ddbac44..b861b50 100644
--- a/chrome/browser/chromeos/login/online_attempt_unittest.cc
+++ b/chrome/browser/chromeos/login/online_attempt_unittest.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/chromeos/login/test_attempt_state.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher_unittest.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
@@ -28,7 +29,7 @@ using ::testing::_;
 
 namespace chromeos {
 
-class OnlineAttemptTest : public ::testing::Test {
+class OnlineAttemptTest : public TestingBrowserProcessTest {
  public:
   OnlineAttemptTest()
       : message_loop_(MessageLoop::TYPE_UI),
diff --git a/chrome/browser/chromeos/login/owner_manager_unittest.cc b/chrome/browser/chromeos/login/owner_manager_unittest.cc
index d539fde..dd43817 100644
--- a/chrome/browser/chromeos/login/owner_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/owner_manager_unittest.cc
@@ -13,6 +13,7 @@
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/chromeos/login/mock_owner_key_utils.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "content/browser/browser_thread.h"
 #include "crypto/nss_util.h"
 #include "crypto/rsa_private_key.h"
@@ -118,7 +119,7 @@ void MockSigner::OnKeyOpComplete(const OwnerManager::KeyOpCode return_code,
 ////////////////////////////////////////////////////////////////////////////////
 // OwnerManagerTest
 
-class OwnerManagerTest : public ::testing::Test {
+class OwnerManagerTest : public TestingBrowserProcessTest {
  public:
   OwnerManagerTest()
       : message_loop_(MessageLoop::TYPE_UI),
diff --git a/chrome/browser/chromeos/login/ownership_service_unittest.cc b/chrome/browser/chromeos/login/ownership_service_unittest.cc
index 7788b58..801a2c8 100644
--- a/chrome/browser/chromeos/login/ownership_service_unittest.cc
+++ b/chrome/browser/chromeos/login/ownership_service_unittest.cc
@@ -13,6 +13,7 @@
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/chromeos/login/mock_owner_key_utils.h"
 #include "chrome/browser/chromeos/login/owner_manager_unittest.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "content/browser/browser_thread.h"
 #include "crypto/nss_util.h"
 #include "crypto/rsa_private_key.h"
@@ -30,7 +31,7 @@ using ::testing::_;
 
 namespace chromeos {
 
-class OwnershipServiceTest : public ::testing::Test {
+class OwnershipServiceTest : public TestingBrowserProcessTest {
  public:
   OwnershipServiceTest()
       : message_loop_(MessageLoop::TYPE_UI),
diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
index 371c7a9..8954f8f 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
@@ -23,6 +23,7 @@
 #include "chrome/browser/chromeos/login/test_attempt_state.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher_unittest.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/url_fetcher.h"
@@ -78,7 +79,7 @@ class TestOnlineAttempt : public OnlineAttempt {
   }
 };
 
-class ParallelAuthenticatorTest : public ::testing::Test {
+class ParallelAuthenticatorTest : public TestingBrowserProcessTest {
  public:
   ParallelAuthenticatorTest()
       : message_loop_(MessageLoop::TYPE_UI),
diff --git a/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc b/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
index f0db486..6715d9f 100644
--- a/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
+++ b/chrome/browser/chromeos/login/signed_settings_helper_unittest.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/chromeos/login/signed_settings.h"
 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -46,7 +47,7 @@ class MockSignedSettingsHelperCallback : public SignedSettingsHelper::Callback {
       const std::string& value));
 };
 
-class SignedSettingsHelperTest : public ::testing::Test,
+class SignedSettingsHelperTest : public TestingBrowserProcessTest,
                                  public SignedSettingsHelper::TestDelegate {
  public:
   SignedSettingsHelperTest()
diff --git a/chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc b/chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc
index 6afa381..7ee4ec0 100644
--- a/chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc
+++ b/chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc
@@ -14,11 +14,12 @@
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/logging_chrome.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
-class SignedSettingsTempStorageTest : public ::testing::Test {
+class SignedSettingsTempStorageTest : public TestingBrowserProcessTest {
  protected:
   virtual void SetUp() {
     ref_map_["some_stuff"] = "a=35;code=64";
diff --git a/chrome/browser/chromeos/login/signed_settings_unittest.cc b/chrome/browser/chromeos/login/signed_settings_unittest.cc
index 8a4ed5c..0177fbc 100644
--- a/chrome/browser/chromeos/login/signed_settings_unittest.cc
+++ b/chrome/browser/chromeos/login/signed_settings_unittest.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/chromeos/login/owner_manager_unittest.h"
 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "content/browser/browser_thread.h"
 #include "crypto/rsa_private_key.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -98,7 +99,7 @@ class ProtoDelegate : public DummyDelegate<const em::PolicyFetchResponse&> {
 
 }  // anonymous namespace
 
-class SignedSettingsTest : public ::testing::Test {
+class SignedSettingsTest : public TestingBrowserProcessTest {
  public:
   SignedSettingsTest()
       : fake_email_("fakey@example.com"),
diff --git a/chrome/browser/chromeos/notifications/desktop_notifications_unittest.h b/chrome/browser/chromeos/notifications/desktop_notifications_unittest.h
index 952ddbf..a93b1d8 100644
--- a/chrome/browser/chromeos/notifications/desktop_notifications_unittest.h
+++ b/chrome/browser/chromeos/notifications/desktop_notifications_unittest.h
@@ -19,6 +19,7 @@
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/notifications_prefs_cache.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
@@ -57,7 +58,7 @@ class MockBalloonCollection : public BalloonCollectionImpl {
   std::set<Balloon*> balloons_;
 };
 
-class DesktopNotificationsTest : public testing::Test {
+class DesktopNotificationsTest : public TestingBrowserProcessTest {
  public:
   DesktopNotificationsTest();
   virtual ~DesktopNotificationsTest();
diff --git a/chrome/browser/chromeos/status/input_method_menu_unittest.cc b/chrome/browser/chromeos/status/input_method_menu_unittest.cc
index fe01aab..ef677b3 100644
--- a/chrome/browser/chromeos/status/input_method_menu_unittest.cc
+++ b/chrome/browser/chromeos/status/input_method_menu_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/test/base/testing_browser_process.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
@@ -111,6 +112,7 @@ TEST(InputMethodMenuTest, GetTextForIndicatorTest) {
 
 // Test whether the function returns language name for non-ambiguous languages.
 TEST(InputMethodMenuTest, GetTextForMenuTest) {
+  ScopedTestingBrowserProcess browser_process;
   // For most languages input method or keyboard layout name is returned.
   // See below for exceptions.
   {
diff --git a/chrome/browser/metrics/metrics_service_uitest.cc b/chrome/browser/metrics/metrics_service_uitest.cc
index 6d25efd..89dcb2e 100644
--- a/chrome/browser/metrics/metrics_service_uitest.cc
+++ b/chrome/browser/metrics/metrics_service_uitest.cc
@@ -57,7 +57,7 @@ class MetricsServiceTest : public UITest {
     FilePath path = user_data_dir().Append(chrome::kLocalStateFilename);
     return PrefServiceMockBuilder().WithUserFilePrefs(path).Create();
   }
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
   // This is not really Windows-specific, the transition is just being done
   // in stages, and Windows is first. See below for more info.
   // TODO(phajdan.jr): Remove #ifdef after fixing http://crbug.com/61062.
diff --git a/chrome/browser/policy/device_policy_cache_unittest.cc b/chrome/browser/policy/device_policy_cache_unittest.cc
index 7b706d1..cd9d062 100644
--- a/chrome/browser/policy/device_policy_cache_unittest.cc
+++ b/chrome/browser/policy/device_policy_cache_unittest.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/chromeos/login/mock_signed_settings_helper.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
 #include "chrome/browser/policy/enterprise_install_attributes.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "policy/configuration_policy_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -69,7 +70,7 @@ void CreateProxyPolicy(em::PolicyFetchResponse* policy,
 
 }  // namespace
 
-class DevicePolicyCacheTest : public testing::Test {
+class DevicePolicyCacheTest : public TestingBrowserProcessTest {
  protected:
   DevicePolicyCacheTest()
       : cryptohome_(chromeos::CryptohomeLibrary::GetImpl(true)),
diff --git a/chrome/browser/ui/webui/options/language_options_handler_unittest.cc b/chrome/browser/ui/webui/options/language_options_handler_unittest.cc
index 5c37af5..e65985d 100644
--- a/chrome/browser/ui/webui/options/language_options_handler_unittest.cc
+++ b/chrome/browser/ui/webui/options/language_options_handler_unittest.cc
@@ -8,6 +8,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "chrome/test/base/testing_browser_process_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
@@ -91,6 +92,8 @@ TEST(LanguageOptionsHandlerTest, GetInputMethodList) {
 }
 
 TEST(LanguageOptionsHandlerTest, GetLanguageList) {
+  ScopedTestingBrowserProcess browser_process;
+
   InputMethodDescriptors descriptors = CreateInputMethodDescriptors();
   scoped_ptr<ListValue> list(
       chromeos::CrosLanguageOptionsHandler::GetLanguageList(descriptors));
diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc
index f765f3d..b95b39d 100644
--- a/chrome/test/base/chrome_test_suite.cc
+++ b/chrome/test/base/chrome_test_suite.cc
@@ -111,7 +111,7 @@ void ChromeTestSuite::Initialize() {
   content::RegisterPathProvider();
   ui::RegisterPathProvider();
 
-#if !defined(OS_WIN)
+#if !defined(OS_WIN) && !defined(OS_LINUX)
   // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
   g_browser_process = new TestingBrowserProcess;
 #endif
@@ -160,7 +160,7 @@ void ChromeTestSuite::Shutdown() {
   base::mac::SetOverrideAppBundle(NULL);
 #endif
 
-#if !defined(OS_WIN)
+#if !defined(OS_WIN) && !defined(OS_LINUX)
   // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
   delete g_browser_process;
   g_browser_process = NULL;
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 56a4632..ad8fd5c 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -94,7 +94,7 @@ void InProcessBrowserTest::SetUp() {
   ASSERT_TRUE(CreateUserDataDirectory())
       << "Could not create user data directory.";
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
   // This is not really Windows-specific, the transition is just being done
   // in stages, and Windows is first. See below for more info.
   DCHECK(!g_browser_process);
@@ -225,7 +225,7 @@ bool InProcessBrowserTest::CreateUserDataDirectory() {
 }
 
 void InProcessBrowserTest::TearDown() {
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
   // This is not really Windows-specific, the transition is just being done
   // in stages, and Windows is first. See below for more info.
   DCHECK(!g_browser_process);
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index fb2f1d4..96f5a2c 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -269,7 +269,7 @@ void TestingBrowserProcess::SetDevToolsManager(DevToolsManager* manager) {
 }
 
 ScopedTestingBrowserProcess::ScopedTestingBrowserProcess() {
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
   // This is not really Windows-specific, the transition is just being done
   // in stages, and Windows is first. See below for more info.
   DCHECK(!g_browser_process);
@@ -289,7 +289,7 @@ ScopedTestingBrowserProcess::ScopedTestingBrowserProcess() {
 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() {
   DCHECK_EQ(browser_process_.get(), g_browser_process);
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
   // This is not really Windows-specific, the transition is just being done
   // in stages, and Windows is first. See below for more info.
   g_browser_process = NULL;