| 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_;
|
| };
|
|
|