Commit 0a48ae82 authored by dubroy@chromium.org's avatar dubroy@chromium.org

Remove references to TestingProfile from password store unit tests.

BUG=334665

Review URL: https://codereview.chromium.org/160463002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251122 0039d316-1c4b-4281-b951-d872f2087c98
parent 06a9e16c
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/files/scoped_temp_dir.h"
#include "base/prefs/pref_service.h" #include "base/prefs/pref_service.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h" #include "base/synchronization/waitable_event.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "chrome/test/base/testing_profile.h"
#include "components/password_manager/core/browser/password_form_data.h" #include "components/password_manager/core/browser/password_form_data.h"
#include "components/password_manager/core/browser/password_store_change.h" #include "components/password_manager/core/browser/password_store_change.h"
#include "components/password_manager/core/browser/password_store_consumer.h" #include "components/password_manager/core/browser/password_store_consumer.h"
...@@ -46,17 +46,20 @@ class MockPasswordStoreObserver : public PasswordStore::Observer { ...@@ -46,17 +46,20 @@ class MockPasswordStoreObserver : public PasswordStore::Observer {
class PasswordStoreDefaultTest : public testing::Test { class PasswordStoreDefaultTest : public testing::Test {
protected: protected:
virtual void SetUp() { virtual void SetUp() OVERRIDE {
profile_.reset(new TestingProfile()); ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
login_db_.reset(new LoginDatabase()); login_db_.reset(new LoginDatabase());
ASSERT_TRUE(login_db_->Init(profile_->GetPath().Append( ASSERT_TRUE(login_db_->Init(temp_dir_.path().Append(
FILE_PATH_LITERAL("login_test")))); FILE_PATH_LITERAL("login_test"))));
} }
virtual void TearDown() OVERRIDE {
ASSERT_TRUE(temp_dir_.Delete());
}
base::MessageLoopForUI message_loop_; base::MessageLoopForUI message_loop_;
scoped_ptr<LoginDatabase> login_db_; scoped_ptr<LoginDatabase> login_db_;
scoped_ptr<TestingProfile> profile_; base::ScopedTempDir temp_dir_;
}; };
ACTION(STLDeleteElements0) { ACTION(STLDeleteElements0) {
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/bind.h" #include "base/bind.h"
#include "base/files/scoped_temp_dir.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/synchronization/waitable_event.h" #include "base/synchronization/waitable_event.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "chrome/test/base/testing_profile.h"
#include "components/password_manager/core/browser/password_form_data.h" #include "components/password_manager/core/browser/password_form_data.h"
#include "components/password_manager/core/browser/password_store_consumer.h" #include "components/password_manager/core/browser/password_store_consumer.h"
#include "components/password_manager/core/browser/password_store_default.h" #include "components/password_manager/core/browser/password_store_default.h"
...@@ -33,17 +33,20 @@ class MockPasswordStoreConsumer : public PasswordStoreConsumer { ...@@ -33,17 +33,20 @@ class MockPasswordStoreConsumer : public PasswordStoreConsumer {
class PasswordStoreTest : public testing::Test { class PasswordStoreTest : public testing::Test {
protected: protected:
virtual void SetUp() { virtual void SetUp() OVERRIDE {
profile_.reset(new TestingProfile()); ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
login_db_.reset(new LoginDatabase()); login_db_.reset(new LoginDatabase());
ASSERT_TRUE(login_db_->Init(profile_->GetPath().Append( ASSERT_TRUE(login_db_->Init(temp_dir_.path().Append(
FILE_PATH_LITERAL("login_test")))); FILE_PATH_LITERAL("login_test"))));
} }
virtual void TearDown() OVERRIDE {
ASSERT_TRUE(temp_dir_.Delete());
}
base::MessageLoopForUI message_loop_; base::MessageLoopForUI message_loop_;
scoped_ptr<LoginDatabase> login_db_; scoped_ptr<LoginDatabase> login_db_;
scoped_ptr<TestingProfile> profile_; base::ScopedTempDir temp_dir_;
}; };
ACTION(STLDeleteElements0) { ACTION(STLDeleteElements0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment