Chromium Code Reviews| Index: chrome/browser/policy/policy_prefs_browsertest.cc |
| diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc |
| index fe86d49ee16508ebafdacff87e9c4f7a1ca73555..7169bd7d506388b83f0d812965aeac86377ef8d5 100644 |
| --- a/chrome/browser/policy/policy_prefs_browsertest.cc |
| +++ b/chrome/browser/policy/policy_prefs_browsertest.cc |
| @@ -178,7 +178,7 @@ class PolicyTestCase { |
| void AddSupportedOs(const std::string& os) { supported_os_.push_back(os); } |
| bool IsSupported() const { |
| -#if !defined(OFFICIAL_BUILD) |
| +#if !defined(GOOGLE_CHROME_BUILD) |
| if (is_official_only()) |
| return false; |
| #endif |
| @@ -611,6 +611,12 @@ IN_PROC_BROWSER_TEST_P(PolicyPrefIndicatorTest, CheckPolicyIndicators) { |
| for (std::vector<std::string>::const_iterator policy = GetParam().begin(); |
| policy != GetParam().end(); |
| ++policy) { |
| + // Skipping the test for |MetricsReportingEnabled| as the corresponding |
| + // checkbox is not using prefs anymore. |
| + // TODO(gayane): New tests should be created to cover |
| + // |MetricsReportingEnabled| crbug.com/414945 |
| + if (*policy == "MetricsReportingEnabled") |
| + continue; |
|
bartfab (slow)
2014/09/19 14:56:37
The correct thing to do is to remove the "indicato
gayane -on leave until 09-2017
2014/09/19 15:24:33
If I only remove test case from the json file, the
gayane1
2014/09/19 15:35:41
Ah I see, you meant not the whole test case but ju
|
| const std::vector<PolicyTestCase*>* policy_test_cases = |
| test_cases.Get(*policy); |
| ASSERT_TRUE(policy_test_cases) << "PolicyTestCase not found for " |