| Index: chrome_elf/chrome_elf_util_unittest.cc
|
| diff --git a/chrome_elf/chrome_elf_util_unittest.cc b/chrome_elf/chrome_elf_util_unittest.cc
|
| index 26b3a26cdd1a62764ae11404df7edf71f17ce02e..28429ee8ec05f7c5b89eb7c18bb8f6e948c5a7bb 100644
|
| --- a/chrome_elf/chrome_elf_util_unittest.cc
|
| +++ b/chrome_elf/chrome_elf_util_unittest.cc
|
| @@ -10,6 +10,8 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "testing/platform_test.h"
|
|
|
| +using namespace install_static;
|
| +
|
| namespace {
|
|
|
| const wchar_t kRegPathClientState[] = L"Software\\Google\\Update\\ClientState";
|
| @@ -138,26 +140,26 @@ TEST_P(ChromeElfUtilTest, MultiInstallTest) {
|
| }
|
|
|
| TEST_P(ChromeElfUtilTest, UsageStatsAbsent) {
|
| - EXPECT_FALSE(AreUsageStatsEnabled(chrome_path_));
|
| + EXPECT_FALSE(GetCollectStatsConsentForTesting(chrome_path_));
|
| }
|
|
|
| TEST_P(ChromeElfUtilTest, UsageStatsZero) {
|
| SetUsageStat(0, false);
|
| - EXPECT_FALSE(AreUsageStatsEnabled(chrome_path_));
|
| + EXPECT_FALSE(GetCollectStatsConsentForTesting(chrome_path_));
|
| }
|
|
|
| TEST_P(ChromeElfUtilTest, UsageStatsOne) {
|
| SetUsageStat(1, false);
|
| - EXPECT_TRUE(AreUsageStatsEnabled(chrome_path_));
|
| + EXPECT_TRUE(GetCollectStatsConsentForTesting(chrome_path_));
|
| if (is_canary_) {
|
| - EXPECT_FALSE(AreUsageStatsEnabled(kChromeUserExePath));
|
| - EXPECT_FALSE(AreUsageStatsEnabled(kChromeSystemExePath));
|
| + EXPECT_FALSE(GetCollectStatsConsentForTesting(kChromeUserExePath));
|
| + EXPECT_FALSE(GetCollectStatsConsentForTesting(kChromeSystemExePath));
|
| } else if (system_level_) {
|
| - EXPECT_FALSE(AreUsageStatsEnabled(kCanaryExePath));
|
| - EXPECT_FALSE(AreUsageStatsEnabled(kChromeUserExePath));
|
| + EXPECT_FALSE(GetCollectStatsConsentForTesting(kCanaryExePath));
|
| + EXPECT_FALSE(GetCollectStatsConsentForTesting(kChromeUserExePath));
|
| } else {
|
| - EXPECT_FALSE(AreUsageStatsEnabled(kCanaryExePath));
|
| - EXPECT_FALSE(AreUsageStatsEnabled(kChromeSystemExePath));
|
| + EXPECT_FALSE(GetCollectStatsConsentForTesting(kCanaryExePath));
|
| + EXPECT_FALSE(GetCollectStatsConsentForTesting(kChromeSystemExePath));
|
| }
|
| }
|
|
|
| @@ -165,16 +167,16 @@ TEST_P(ChromeElfUtilTest, UsageStatsZeroInStateMedium) {
|
| if (!system_level_)
|
| return;
|
| SetUsageStat(0, true);
|
| - EXPECT_FALSE(AreUsageStatsEnabled(chrome_path_));
|
| + EXPECT_FALSE(GetCollectStatsConsentForTesting(chrome_path_));
|
| }
|
|
|
| TEST_P(ChromeElfUtilTest, UsageStatsOneInStateMedium) {
|
| if (!system_level_)
|
| return;
|
| SetUsageStat(1, true);
|
| - EXPECT_TRUE(AreUsageStatsEnabled(chrome_path_));
|
| - EXPECT_FALSE(AreUsageStatsEnabled(kCanaryExePath));
|
| - EXPECT_FALSE(AreUsageStatsEnabled(kChromeUserExePath));
|
| + EXPECT_TRUE(GetCollectStatsConsentForTesting(chrome_path_));
|
| + EXPECT_FALSE(GetCollectStatsConsentForTesting(kCanaryExePath));
|
| + EXPECT_FALSE(GetCollectStatsConsentForTesting(kChromeUserExePath));
|
| }
|
|
|
| INSTANTIATE_TEST_CASE_P(Canary, ChromeElfUtilTest,
|
|
|