Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(976)

Unified Diff: chrome/browser/sync/abstract_profile_sync_service_test.h

Issue 12033093: sync: Implementation of Priority Preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Attempting to parametrize the PSS pref test fixture to also test priority prefs. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/abstract_profile_sync_service_test.h
diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.h b/chrome/browser/sync/abstract_profile_sync_service_test.h
index 555b197b5e6dd5fff5ccc3e0475d292c0d41183f..4adb366280d39089971308ec63498e897069fb30 100644
--- a/chrome/browser/sync/abstract_profile_sync_service_test.h
+++ b/chrome/browser/sync/abstract_profile_sync_service_test.h
@@ -37,14 +37,14 @@ class ProfileSyncServiceTestHelper {
const sync_pb::EntitySpecifics& specifics);
};
-class AbstractProfileSyncServiceTest : public testing::Test {
+class BaseProfileSyncServiceTest {
public:
- AbstractProfileSyncServiceTest();
- virtual ~AbstractProfileSyncServiceTest();
+ BaseProfileSyncServiceTest();
+ virtual ~BaseProfileSyncServiceTest();
- virtual void SetUp() OVERRIDE;
+ virtual void SetUp();
- virtual void TearDown() OVERRIDE;
+ virtual void TearDown();
bool CreateRoot(syncer::ModelType model_type);
@@ -59,9 +59,19 @@ class AbstractProfileSyncServiceTest : public testing::Test {
TestProfileSyncService* sync_service_;
};
+class AbstractProfileSyncServiceTest : public BaseProfileSyncServiceTest,
+ public ::testing::Test {
+ public:
+ AbstractProfileSyncServiceTest();
+ virtual ~AbstractProfileSyncServiceTest();
+
+ virtual void SetUp() OVERRIDE;
+ virtual void TearDown() OVERRIDE;
+};
+
class CreateRootHelper {
public:
- CreateRootHelper(AbstractProfileSyncServiceTest* test,
+ CreateRootHelper(BaseProfileSyncServiceTest* test,
syncer::ModelType model_type);
virtual ~CreateRootHelper();
@@ -72,7 +82,7 @@ class CreateRootHelper {
void CreateRootCallback();
base::Closure callback_;
- AbstractProfileSyncServiceTest* test_;
+ BaseProfileSyncServiceTest* test_;
syncer::ModelType model_type_;
bool success_;
};

Powered by Google App Engine
This is Rietveld 408576698