| Index: chrome/browser/extensions/chrome_app_sorting_unittest.cc
|
| diff --git a/chrome/browser/extensions/chrome_app_sorting_unittest.cc b/chrome/browser/extensions/chrome_app_sorting_unittest.cc
|
| index d5737f805177692de3a839a756e4cce6a9153b31..ed25683f0b045b0cee640d4eb0aba72e20a8ac2a 100644
|
| --- a/chrome/browser/extensions/chrome_app_sorting_unittest.cc
|
| +++ b/chrome/browser/extensions/chrome_app_sorting_unittest.cc
|
| @@ -17,6 +17,9 @@ namespace extensions {
|
| namespace keys = manifest_keys;
|
|
|
| class ChromeAppSortingTest : public ExtensionPrefsTest {
|
| + public:
|
| + ChromeAppSortingTest() : ExtensionPrefsTest(NULL) {}
|
| +
|
| protected:
|
| ChromeAppSorting* app_sorting() {
|
| return static_cast<ChromeAppSorting*>(prefs()->app_sorting());
|
| @@ -149,7 +152,7 @@ TEST_F(ChromeAppSortingPageOrdinal, ChromeAppSortingPageOrdinal) {}
|
| // of old page and app launch indices and properly convert them.
|
| class ChromeAppSortingInitialize : public PrefsPrepopulatedTestBase {
|
| public:
|
| - ChromeAppSortingInitialize() {}
|
| + ChromeAppSortingInitialize() : PrefsPrepopulatedTestBase(NULL) {}
|
| virtual ~ChromeAppSortingInitialize() {}
|
|
|
| virtual void Initialize() OVERRIDE {
|
| @@ -217,7 +220,7 @@ TEST_F(ChromeAppSortingInitialize, ChromeAppSortingInitialize) {}
|
| // (i.e. make sure that the web store icon is still loaded into the map).
|
| class ChromeAppSortingInitializeWithNoApps : public PrefsPrepopulatedTestBase {
|
| public:
|
| - ChromeAppSortingInitializeWithNoApps() {}
|
| + ChromeAppSortingInitializeWithNoApps() : PrefsPrepopulatedTestBase(NULL) {}
|
| virtual ~ChromeAppSortingInitializeWithNoApps() {}
|
|
|
| virtual void Initialize() OVERRIDE {
|
| @@ -265,7 +268,7 @@ TEST_F(ChromeAppSortingInitializeWithNoApps,
|
| class ChromeAppSortingMigrateAppIndexInvalid
|
| : public PrefsPrepopulatedTestBase {
|
| public:
|
| - ChromeAppSortingMigrateAppIndexInvalid() {}
|
| + ChromeAppSortingMigrateAppIndexInvalid() : PrefsPrepopulatedTestBase(NULL) {}
|
| virtual ~ChromeAppSortingMigrateAppIndexInvalid() {}
|
|
|
| virtual void Initialize() OVERRIDE {
|
| @@ -301,7 +304,8 @@ TEST_F(ChromeAppSortingMigrateAppIndexInvalid,
|
| class ChromeAppSortingFixNTPCollisionsAllCollide
|
| : public PrefsPrepopulatedTestBase {
|
| public:
|
| - ChromeAppSortingFixNTPCollisionsAllCollide() {}
|
| + ChromeAppSortingFixNTPCollisionsAllCollide()
|
| + : PrefsPrepopulatedTestBase(NULL) {}
|
| virtual ~ChromeAppSortingFixNTPCollisionsAllCollide() {}
|
|
|
| virtual void Initialize() OVERRIDE {
|
| @@ -357,7 +361,8 @@ TEST_F(ChromeAppSortingFixNTPCollisionsAllCollide,
|
| class ChromeAppSortingFixNTPCollisionsSomeCollideAtStart
|
| : public PrefsPrepopulatedTestBase {
|
| public:
|
| - ChromeAppSortingFixNTPCollisionsSomeCollideAtStart() {}
|
| + ChromeAppSortingFixNTPCollisionsSomeCollideAtStart()
|
| + : PrefsPrepopulatedTestBase(NULL) {}
|
| virtual ~ChromeAppSortingFixNTPCollisionsSomeCollideAtStart() {}
|
|
|
| virtual void Initialize() OVERRIDE {
|
| @@ -415,7 +420,8 @@ TEST_F(ChromeAppSortingFixNTPCollisionsSomeCollideAtStart,
|
| class ChromeAppSortingFixNTPCollisionsSomeCollideAtEnd
|
| : public PrefsPrepopulatedTestBase {
|
| public:
|
| - ChromeAppSortingFixNTPCollisionsSomeCollideAtEnd() {}
|
| + ChromeAppSortingFixNTPCollisionsSomeCollideAtEnd()
|
| + : PrefsPrepopulatedTestBase(NULL) {}
|
| virtual ~ChromeAppSortingFixNTPCollisionsSomeCollideAtEnd() {}
|
|
|
| virtual void Initialize() OVERRIDE {
|
| @@ -473,7 +479,8 @@ TEST_F(ChromeAppSortingFixNTPCollisionsSomeCollideAtEnd,
|
| class ChromeAppSortingFixNTPCollisionsTwoCollisions
|
| : public PrefsPrepopulatedTestBase {
|
| public:
|
| - ChromeAppSortingFixNTPCollisionsTwoCollisions() {}
|
| + ChromeAppSortingFixNTPCollisionsTwoCollisions()
|
| + : PrefsPrepopulatedTestBase(NULL) {}
|
| virtual ~ChromeAppSortingFixNTPCollisionsTwoCollisions() {}
|
|
|
| virtual void Initialize() OVERRIDE {
|
| @@ -541,7 +548,7 @@ TEST_F(ChromeAppSortingFixNTPCollisionsTwoCollisions,
|
| class ChromeAppSortingEnsureValidOrdinals
|
| : public PrefsPrepopulatedTestBase {
|
| public :
|
| - ChromeAppSortingEnsureValidOrdinals() {}
|
| + ChromeAppSortingEnsureValidOrdinals() : PrefsPrepopulatedTestBase(NULL) {}
|
| virtual ~ChromeAppSortingEnsureValidOrdinals() {}
|
|
|
| virtual void Initialize() OVERRIDE {}
|
| @@ -566,7 +573,7 @@ TEST_F(ChromeAppSortingEnsureValidOrdinals,
|
|
|
| class ChromeAppSortingPageOrdinalMapping : public PrefsPrepopulatedTestBase {
|
| public:
|
| - ChromeAppSortingPageOrdinalMapping() {}
|
| + ChromeAppSortingPageOrdinalMapping() : PrefsPrepopulatedTestBase(NULL) {}
|
| virtual ~ChromeAppSortingPageOrdinalMapping() {}
|
|
|
| virtual void Initialize() OVERRIDE {}
|
| @@ -622,7 +629,7 @@ TEST_F(ChromeAppSortingPageOrdinalMapping,
|
|
|
| class ChromeAppSortingPreinstalledAppsBase : public PrefsPrepopulatedTestBase {
|
| public:
|
| - ChromeAppSortingPreinstalledAppsBase() {
|
| + ChromeAppSortingPreinstalledAppsBase() : PrefsPrepopulatedTestBase(NULL) {
|
| DictionaryValue simple_dict;
|
| simple_dict.SetString(keys::kVersion, "1.0.0.0");
|
| simple_dict.SetString(keys::kName, "unused");
|
|
|