Revert of ChromeOS: Per-user time zone: refactor tests first.

chrome/browser/chromeos/login/auth/cryptohome_authenticator_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 <stdint.h>
 
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 122 matching lines @@
 
 class CryptohomeAuthenticatorTest : public testing::Test {
  public:
   CryptohomeAuthenticatorTest()
       : user_context_(AccountId::FromUserEmail("me@nowhere.org")),
         user_manager_(new chromeos::FakeChromeUserManager()),
         user_manager_enabler_(user_manager_),
         mock_caller_(NULL),
         mock_homedir_methods_(NULL),
         owner_key_util_(new ownership::MockOwnerKeyUtil()) {
-    // Testing profile must be initialized after user_manager_ +
-    // user_manager_enabler_, because it will create another UserManager
-    // instance if UserManager instance has not been registed before.
-    profile_.reset(new TestingProfile);
     OwnerSettingsServiceChromeOSFactory::GetInstance()
         ->SetOwnerKeyUtilForTesting(owner_key_util_);
     user_context_.SetKey(Key("fakepass"));
     user_context_.SetUserIDHash("me_nowhere_com_hash");
     const user_manager::User* user =
         user_manager_->AddUser(user_context_.GetAccountId());
-    profile_->set_profile_name(user_context_.GetAccountId().GetUserEmail());
+    profile_.set_profile_name(user_context_.GetAccountId().GetUserEmail());
 
-    ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
-                                                            profile_.get());
+    ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, &profile_);
 
     CreateTransformedKey(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF,
                          SystemSaltGetter::ConvertRawSaltToHexString(
                              FakeCryptohomeClient::GetStubSystemSalt()));
   }
 
   ~CryptohomeAuthenticatorTest() override {}
 
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
@@ skipping 156 matching lines @@
 
   UserContext user_context_;
   UserContext user_context_with_transformed_key_;
   Key transformed_key_;
 
   std::vector<cryptohome::KeyDefinition> key_definitions_;
 
   ScopedDeviceSettingsTestHelper device_settings_test_helper_;
   ScopedTestCrosSettings test_cros_settings_;
 
+  TestingProfile profile_;
+  std::unique_ptr<TestingProfileManager> profile_manager_;
   chromeos::FakeChromeUserManager* user_manager_;
-  std::unique_ptr<TestingProfile> profile_;
-  std::unique_ptr<TestingProfileManager> profile_manager_;
   ScopedUserManagerEnabler user_manager_enabler_;
 
   cryptohome::MockAsyncMethodCaller* mock_caller_;
   cryptohome::MockHomedirMethods* mock_homedir_methods_;
 
   MockAuthStatusConsumer consumer_;
 
   scoped_refptr<CryptohomeAuthenticator> auth_;
   std::unique_ptr<TestAttemptState> state_;
   FakeCryptohomeClient* fake_cryptohome_client_;
@@ skipping 441 matching lines @@
   // pre-hashed key was used to create the cryptohome but without the required
   // salt.
   ExpectGetKeyDataExCall(base::MakeUnique<int64_t>(Key::KEY_TYPE_SALTED_SHA256),
                          std::unique_ptr<std::string>());
 
   auth_->AuthenticateToLogin(NULL, user_context_);
   base::RunLoop().Run();
 }
 
 }  // namespace chromeos