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

Unified Diff: chrome/browser/ui/app_list/search/app_search_provider_unittest.cc

Issue 2787693002: Remove more dead app list code. (Closed)
Patch Set: updated comment Created 3 years, 9 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/ui/app_list/search/app_search_provider_unittest.cc
diff --git a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
index 5fe60f5100234e3d3c5186d53dcbc8437d58e293..e500d137c9bdc3c2a751cf1f8a085fd694c43a20 100644
--- a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
+++ b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
@@ -29,12 +29,9 @@
#include "ui/app_list/app_list_item.h"
#include "ui/app_list/app_list_model.h"
#include "ui/app_list/search_result.h"
-
-#if defined(OS_CHROMEOS)
#include "chrome/browser/ui/app_list/arc/arc_app_item.h"
#include "chrome/browser/ui/app_list/arc/arc_app_test.h"
#include "components/arc/test/fake_app_instance.h"
-#endif
namespace app_list {
namespace test {
@@ -100,14 +97,12 @@ class AppSearchProviderTest : public AppListTestBase {
};
TEST_F(AppSearchProviderTest, Basic) {
-#if defined(OS_CHROMEOS)
ArcAppTest arc_test;
arc_test.SetUp(profile());
arc_test.app_instance()->RefreshAppList();
std::vector<arc::mojom::AppInfo> arc_apps(arc_test.fake_apps().begin(),
arc_test.fake_apps().begin() + 2);
arc_test.app_instance()->SendRefreshAppList(arc_apps);
-#endif
CreateSearch();
@@ -126,14 +121,12 @@ TEST_F(AppSearchProviderTest, Basic) {
EXPECT_EQ("Packaged App 1", RunQuery("papp1"));
EXPECT_EQ("Hosted App", RunQuery("host"));
-#if defined(OS_CHROMEOS)
result = RunQuery("fake");
EXPECT_TRUE(result == "Fake App 0,Fake App 1" ||
result == "Fake App 1,Fake App 0");
result = RunQuery("app1");
EXPECT_TRUE(result == "Packaged App 1,Fake App 1" ||
result == "Fake App 1,Packaged App 1");
-#endif
}
TEST_F(AppSearchProviderTest, DisableAndEnable) {
@@ -173,7 +166,6 @@ TEST_F(AppSearchProviderTest, UninstallExtension) {
base::RunLoop().RunUntilIdle();
}
-#if defined(OS_CHROMEOS)
TEST_F(AppSearchProviderTest, InstallUninstallArc) {
ArcAppTest arc_test;
arc_test.SetUp(profile());
@@ -209,7 +201,6 @@ TEST_F(AppSearchProviderTest, InstallUninstallArc) {
// Let uninstall code to clean up.
base::RunLoop().RunUntilIdle();
}
-#endif
TEST_F(AppSearchProviderTest, FetchRecommendations) {
CreateSearch();
« no previous file with comments | « chrome/browser/ui/app_list/search/app_search_provider.cc ('k') | chrome/browser/ui/app_list/search/extension_app_result.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698