diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-23 22:02:50 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-23 22:02:50 +0000 |
| commit | edf178a3540eac52966340073a2dc8872f1478b2 (patch) | |
| tree | b3c05686175f2b00051706427936959cbccab72c /chrome/browser/user_data_manager.cc | |
| parent | 1b50eb4c417d80d2e84fc376d285488e1603bf60 (diff) | |
| download | chromium_src-edf178a3540eac52966340073a2dc8872f1478b2.zip chromium_src-edf178a3540eac52966340073a2dc8872f1478b2.tar.gz chromium_src-edf178a3540eac52966340073a2dc8872f1478b2.tar.bz2 | |
Reverts my user data manager change as it breaks the mac buildbot.
BUG=none
TEST=none
TBR=munjal
Review URL: http://codereview.chromium.org/18564
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/user_data_manager.cc')
| -rw-r--r-- | chrome/browser/user_data_manager.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/user_data_manager.cc b/chrome/browser/user_data_manager.cc index bc078db..554c53f 100644 --- a/chrome/browser/user_data_manager.cc +++ b/chrome/browser/user_data_manager.cc @@ -91,12 +91,11 @@ static const wchar_t kProfileFolderSeparator[] = L"-"; UserDataManager* UserDataManager::instance_ = NULL; // static -UserDataManager* UserDataManager::Create() { +void UserDataManager::Create() { DCHECK(!instance_); std::wstring user_data; PathService::Get(chrome::DIR_USER_DATA, &user_data); instance_ = new UserDataManager(user_data); - return instance_; } // static @@ -124,8 +123,6 @@ UserDataManager::UserDataManager(const std::wstring& user_data_root) } UserDataManager::~UserDataManager() { - if (instance_ == this) - instance_ = NULL; } // static |