Correctly integrate StoragePartition into TestingProfile.

chrome/browser/chromeos/login/user_manager_unittest.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 <cstdlib>
 #include <cstring>
 
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/user_manager_impl.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/test/base/testing_browser_process.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 class UserManagerTest : public testing::Test {
- public:
-  UserManagerTest()
-      : message_loop_(base::MessageLoop::TYPE_UI),
-        ui_thread_(content::BrowserThread::UI, &message_loop_),
-        file_thread_(content::BrowserThread::FILE, &message_loop_) {
-  }
-
+ protected:
   virtual void SetUp() OVERRIDE {
     cros_settings_ = CrosSettings::Get();
 
     // Replace the real DeviceSettingsProvider with a stub.
     device_settings_provider_ =
         cros_settings_->GetProvider(chromeos::kReportDeviceVersionInfo);
     EXPECT_TRUE(device_settings_provider_);
     EXPECT_TRUE(
         cros_settings_->RemoveSettingsProvider(device_settings_provider_));
     cros_settings_->AddSettingsProvider(&stub_settings_provider_);
@@ skipping 71 matching lines @@
     stub_settings_provider_.Set(kDeviceOwner, owner_value);
     stub_settings_provider_.Set(kAccountsPrefSupervisedUsersEnabled,
         base::FundamentalValue(locally_managed_users_enabled));
   }
 
   void RetrieveTrustedDevicePolicies() {
     GetUserManagerImpl()->RetrieveTrustedDevicePolicies();
   }
 
  protected:
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
 
   CrosSettings* cros_settings_;
   CrosSettingsProvider* device_settings_provider_;
   StubCrosSettingsProvider stub_settings_provider_;
   scoped_ptr<TestingPrefServiceSimple> local_state_;
 
   ScopedTestDeviceSettingsService test_device_settings_service_;
   ScopedStubNetworkLibraryEnabler stub_network_library_enabler_;
   ScopedTestCrosSettings test_cros_settings_;
 
@@ skipping 55 matching lines @@
 TEST_F(UserManagerTest, DisablingLMUByDeviceSettings) {
   SetDeviceSettings(false, "owner@invalid.domain", false);
   RetrieveTrustedDevicePolicies();
   EXPECT_EQ(GetUserManagerLocallyManagedUsersEnabledByPolicy(), false);
   SetDeviceSettings(false, "owner@invalid.domain", true);
   RetrieveTrustedDevicePolicies();
   EXPECT_EQ(GetUserManagerLocallyManagedUsersEnabledByPolicy(), true);
 }
 
 }  // namespace chromeos