diff options
author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-17 00:28:13 +0000 |
---|---|---|
committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-17 00:28:13 +0000 |
commit | 066629fad83ffbc3c3d67d2c19191d1da36138ef (patch) | |
tree | 889cb8be535354b58bb3859b5c8c951f8bb3e79c /chrome/test/testing_profile.cc | |
parent | 64e0ec0be0663c7f520c6cb9728c055edc916a89 (diff) | |
download | chromium_src-066629fad83ffbc3c3d67d2c19191d1da36138ef.zip chromium_src-066629fad83ffbc3c3d67d2c19191d1da36138ef.tar.gz chromium_src-066629fad83ffbc3c3d67d2c19191d1da36138ef.tar.bz2 |
Rename CHROME_PERSONALIZATION to BROWSER_SYNC.
Avoid #ifdef in general, favoring #if defined().
In one spot, use PlatformThread::Sleep instead of rolling our own.
Review URL: http://codereview.chromium.org/267125
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.cc')
-rw-r--r-- | chrome/test/testing_profile.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index cb380fc..460b3c5 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -202,7 +202,7 @@ void TestingProfile::BlockUntilHistoryProcessesPendingRequests() { } void TestingProfile::CreateProfileSyncService() { -#ifdef CHROME_PERSONALIZATION +#if defined(BROWSER_SYNC) if (!profile_sync_service_.get()) { profile_sync_service_.reset(new ProfileSyncService(this)); profile_sync_service_->Initialize(); @@ -211,7 +211,7 @@ void TestingProfile::CreateProfileSyncService() { } ProfileSyncService* TestingProfile::GetProfileSyncService() { -#ifdef CHROME_PERSONALIZATION +#if defined(BROWSER_SYNC) return profile_sync_service_.get(); #endif return NULL; |