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

Side by Side Diff: chrome/browser/ui/app_list/arc/arc_app_unittest.cc

Issue 2129743002: Disable ArcAppModelBuilderTest.RequestShortcutIcons on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 // Validate that we have a request for each icon for each supported scale 655 // Validate that we have a request for each icon for each supported scale
656 // factor. 656 // factor.
657 EXPECT_EQ(fake_apps().size(), app_masks.size()); 657 EXPECT_EQ(fake_apps().size(), app_masks.size());
658 for (auto& app : fake_apps()) { 658 for (auto& app : fake_apps()) {
659 const std::string id = ArcAppTest::GetAppId(app); 659 const std::string id = ArcAppTest::GetAppId(app);
660 ASSERT_NE(app_masks.find(id), app_masks.end()); 660 ASSERT_NE(app_masks.find(id), app_masks.end());
661 EXPECT_EQ(app_masks[id], expected_mask); 661 EXPECT_EQ(app_masks[id], expected_mask);
662 } 662 }
663 } 663 }
664 664
665 TEST_F(ArcAppModelBuilderTest, RequestShortcutIcons) { 665 // TODO(crbug.com/624446) - reenable once this test is fixed
666 TEST_F(ArcAppModelBuilderTest, DISABLED_RequestShortcutIcons) {
666 // Make sure we are on UI thread. 667 // Make sure we are on UI thread.
667 ASSERT_TRUE(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 668 ASSERT_TRUE(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
668 669
669 bridge_service()->SetReady(); 670 bridge_service()->SetReady();
670 const arc::mojom::ShortcutInfo& shortcut = fake_shortcuts()[0]; 671 const arc::mojom::ShortcutInfo& shortcut = fake_shortcuts()[0];
671 app_instance()->SendInstallShortcut(shortcut); 672 app_instance()->SendInstallShortcut(shortcut);
672 673
673 ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile_.get()); 674 ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile_.get());
674 ASSERT_NE(nullptr, prefs); 675 ASSERT_NE(nullptr, prefs);
675 676
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 EXPECT_FALSE(prefs->HasObserver(&launcher1)); 942 EXPECT_FALSE(prefs->HasObserver(&launcher1));
942 EXPECT_TRUE(prefs->HasObserver(&launcher3)); 943 EXPECT_TRUE(prefs->HasObserver(&launcher3));
943 944
944 ArcAppLauncher launcher2(profile(), id2, true); 945 ArcAppLauncher launcher2(profile(), id2, true);
945 EXPECT_TRUE(launcher2.app_launched()); 946 EXPECT_TRUE(launcher2.app_launched());
946 app_instance()->WaitForIncomingMethodCall(); 947 app_instance()->WaitForIncomingMethodCall();
947 EXPECT_FALSE(prefs->HasObserver(&launcher2)); 948 EXPECT_FALSE(prefs->HasObserver(&launcher2));
948 ASSERT_EQ(2u, app_instance()->launch_requests().size()); 949 ASSERT_EQ(2u, app_instance()->launch_requests().size());
949 EXPECT_TRUE(app_instance()->launch_requests()[1]->IsForApp(app2)); 950 EXPECT_TRUE(app_instance()->launch_requests()[1]->IsForApp(app2));
950 } 951 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698