Index: chrome/browser/chromeos/note_taking_helper_unittest.cc |
diff --git a/chrome/browser/chromeos/note_taking_helper_unittest.cc b/chrome/browser/chromeos/note_taking_helper_unittest.cc |
index c2f878315d4d9609f4ac2881898aeba6dd8699f4..edf2bf4559bfc667e5d6f4ae5f5c94d535565523 100644 |
--- a/chrome/browser/chromeos/note_taking_helper_unittest.cc |
+++ b/chrome/browser/chromeos/note_taking_helper_unittest.cc |
@@ -359,6 +359,7 @@ TEST_P(NoteTakingHelperTest, ListChromeApps) { |
kProdKeepAppName, false /* preferred */, |
NoteTakingLockScreenSupport::kNotSupported), |
GetAppString(apps[1])); |
+ EXPECT_FALSE(helper()->GetPreferredChromeAppInfo(profile())); |
// Now install a random extension and check that it's ignored. |
const extensions::ExtensionId kOtherId = crx_file::id_util::GenerateId("a"); |
@@ -376,6 +377,7 @@ TEST_P(NoteTakingHelperTest, ListChromeApps) { |
kProdKeepAppName, false /* preferred */, |
NoteTakingLockScreenSupport::kNotSupported), |
GetAppString(apps[1])); |
+ EXPECT_FALSE(helper()->GetPreferredChromeAppInfo(profile())); |
// Mark the prod version as preferred. |
helper()->SetPreferredApp(profile(), NoteTakingHelper::kProdKeepExtensionId); |
@@ -389,6 +391,14 @@ TEST_P(NoteTakingHelperTest, ListChromeApps) { |
kProdKeepAppName, true /* preferred */, |
NoteTakingLockScreenSupport::kNotSupported), |
GetAppString(apps[1])); |
+ |
+ std::unique_ptr<NoteTakingAppInfo> preferred_info = |
+ helper()->GetPreferredChromeAppInfo(profile()); |
+ ASSERT_TRUE(preferred_info); |
+ EXPECT_EQ(GetAppString(NoteTakingHelper::kProdKeepExtensionId, |
+ kProdKeepAppName, true /* preferred */, |
+ NoteTakingLockScreenSupport::kNotSupported), |
+ GetAppString(*preferred_info)); |
} |
TEST_P(NoteTakingHelperTest, ListChromeAppsWithLockScreenNotesSupported) { |
@@ -415,6 +425,7 @@ TEST_P(NoteTakingHelperTest, ListChromeAppsWithLockScreenNotesSupported) { |
kProdKeepAppName, false /* preferred */, |
NoteTakingLockScreenSupport::kNotSupported), |
GetAppString(apps[0])); |
+ EXPECT_FALSE(helper()->GetPreferredChromeAppInfo(profile())); |
std::unique_ptr<base::Value> lock_enabled_action_handler = |
extensions::ListBuilder() |
@@ -442,6 +453,7 @@ TEST_P(NoteTakingHelperTest, ListChromeAppsWithLockScreenNotesSupported) { |
kProdKeepAppName, false /* preferred */, |
NoteTakingLockScreenSupport::kNotSupported), |
GetAppString(apps[1])); |
+ EXPECT_FALSE(helper()->GetPreferredChromeAppInfo(profile())); |
} |
TEST_P(NoteTakingHelperTest, PreferredAppEnabledOnLockScreen) { |
@@ -472,6 +484,7 @@ TEST_P(NoteTakingHelperTest, PreferredAppEnabledOnLockScreen) { |
false /* preferred */, |
NoteTakingLockScreenSupport::kSupported), |
GetAppString(apps[0])); |
+ EXPECT_FALSE(helper()->GetPreferredChromeAppInfo(profile())); |
// When the lock screen note taking pref is set and the Keep app is set as the |
// preferred note taking app, the app should be reported as selected as lock |
@@ -485,6 +498,13 @@ TEST_P(NoteTakingHelperTest, PreferredAppEnabledOnLockScreen) { |
true /* preferred */, |
NoteTakingLockScreenSupport::kSelected), |
GetAppString(apps[0])); |
+ std::unique_ptr<NoteTakingAppInfo> preferred_info = |
+ helper()->GetPreferredChromeAppInfo(profile()); |
+ ASSERT_TRUE(preferred_info); |
+ EXPECT_EQ(GetAppString(NoteTakingHelper::kDevKeepExtensionId, kDevKeepAppName, |
+ true /* preferred */, |
+ NoteTakingLockScreenSupport::kSelected), |
+ GetAppString(*preferred_info)); |
// When lock screen note taking pref is reset, the app should not be reported |
// as selected on lock screen. |
@@ -496,6 +516,12 @@ TEST_P(NoteTakingHelperTest, PreferredAppEnabledOnLockScreen) { |
true /* preferred */, |
NoteTakingLockScreenSupport::kSupported), |
GetAppString(apps[0])); |
+ preferred_info = helper()->GetPreferredChromeAppInfo(profile()); |
+ ASSERT_TRUE(preferred_info); |
+ EXPECT_EQ(GetAppString(NoteTakingHelper::kDevKeepExtensionId, kDevKeepAppName, |
+ true /* preferred */, |
+ NoteTakingLockScreenSupport::kSupported), |
+ GetAppString(*preferred_info)); |
} |
TEST_P(NoteTakingHelperTest, |
@@ -884,6 +910,21 @@ TEST_P(NoteTakingHelperTest, ListAndroidApps) { |
NoteTakingLockScreenSupport::kNotSupported), |
GetAppString(apps[1])); |
+ helper()->SetPreferredApp(profile(), kPackage1); |
+ |
+ apps = helper()->GetAvailableApps(profile()); |
+ ASSERT_EQ(2u, apps.size()); |
+ EXPECT_EQ(GetAppString(kPackage1, kName1, true /* preferred */, |
+ NoteTakingLockScreenSupport::kNotSupported), |
+ GetAppString(apps[0])); |
+ EXPECT_EQ(GetAppString(kPackage2, kName2, false /* preferred */, |
+ NoteTakingLockScreenSupport::kNotSupported), |
+ GetAppString(apps[1])); |
+ |
+ std::unique_ptr<NoteTakingAppInfo> preferred_info = |
+ helper()->GetPreferredChromeAppInfo(profile()); |
+ EXPECT_FALSE(preferred_info); |
+ |
// TODO(victorhsieh): Opt-out on Persistent ARC is special. Skip until |
// implemented. |
if (arc::ShouldArcAlwaysStart()) |