Chromium Code Reviews| 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 148e4f13ffa51a66e575a5168920d8d1c4e0cd7d..c30e3b1ef2d4de311352c1f6fb02cc70c613a45a 100644 |
| --- a/chrome/browser/extensions/chrome_app_sorting_unittest.cc |
| +++ b/chrome/browser/extensions/chrome_app_sorting_unittest.cc |
| @@ -9,6 +9,7 @@ |
| #include "chrome/browser/extensions/./extension_prefs_unittest.h" |
| #include "chrome/common/extensions/extension_constants.h" |
|
Fady Samuel
2014/08/29 19:39:46
Is this still necessary?
Xi Han
2014/08/29 19:52:53
Removed.
|
| #include "components/crx_file/id_util.h" |
| +#include "extensions/common/constants.h" |
| #include "extensions/common/manifest_constants.h" |
| #include "sync/api/string_ordinal.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| @@ -227,9 +228,9 @@ class ChromeAppSortingInitializeWithNoApps : public PrefsPrepopulatedTestBase { |
| // Make sure that the web store has valid ordinals. |
| syncer::StringOrdinal initial_ordinal = |
| syncer::StringOrdinal::CreateInitialOrdinal(); |
| - app_sorting->SetPageOrdinal(extension_misc::kWebStoreAppId, |
| + app_sorting->SetPageOrdinal(extensions::kWebStoreAppId, |
| initial_ordinal); |
| - app_sorting->SetAppLaunchOrdinal(extension_misc::kWebStoreAppId, |
| + app_sorting->SetAppLaunchOrdinal(extensions::kWebStoreAppId, |
| initial_ordinal); |
| ExtensionIdList ids; |
| @@ -240,7 +241,7 @@ class ChromeAppSortingInitializeWithNoApps : public PrefsPrepopulatedTestBase { |
| static_cast<ChromeAppSorting*>(prefs()->app_sorting()); |
| syncer::StringOrdinal page = |
| - app_sorting->GetPageOrdinal(extension_misc::kWebStoreAppId); |
| + app_sorting->GetPageOrdinal(extensions::kWebStoreAppId); |
| EXPECT_TRUE(page.IsValid()); |
| ChromeAppSorting::PageOrdinalMap::iterator page_it = |
| @@ -248,7 +249,7 @@ class ChromeAppSortingInitializeWithNoApps : public PrefsPrepopulatedTestBase { |
| EXPECT_TRUE(page_it != app_sorting->ntp_ordinal_map_.end()); |
| syncer::StringOrdinal app_launch = |
| - app_sorting->GetPageOrdinal(extension_misc::kWebStoreAppId); |
| + app_sorting->GetPageOrdinal(extensions::kWebStoreAppId); |
| EXPECT_TRUE(app_launch.IsValid()); |
| ChromeAppSorting::AppLaunchOrdinalMap::iterator app_launch_it = |