Skip MetricsReportingEnabled test

chrome/browser/policy/policy_prefs_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <cstdlib>
 #include <map>
 #include <sstream>
 #include <string>
 #include <vector>
@@ skipping 160 matching lines @@
     const std::string os("linux");
 #else
 #error "Unknown platform"
 #endif
     return std::find(supported_os_.begin(), supported_os_.end(), os) !=
         supported_os_.end();
   }
   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
     return IsOsSupported();
   }
 
   const base::DictionaryValue& test_policy() const { return test_policy_; }
   void SetTestPolicy(const base::DictionaryValue& policy) {
     test_policy_.Clear();
     test_policy_.MergeDictionary(&policy);
@@ skipping 412 matching lines @@
 IN_PROC_BROWSER_TEST_P(PolicyPrefIndicatorTest, CheckPolicyIndicators) {
   const PolicyTestCases test_cases;
   PrefService* local_state = g_browser_process->local_state();
   PrefService* user_prefs = browser()->profile()->GetPrefs();
 
   ui_test_utils::NavigateToURL(browser(), GURL(kMainSettingsPage));
 
   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 "indicator_tests" entry for
|MetricsReportingEnabled| from policy_test_cases.json, not to change the code.

[gayane -on leave until 09-2017, 2014/09/19 15:24:33]

If I only remove test case from the json file, the assert at Line 622 will fail
because it cannot find a test case for the policy.

[gayane1, 2014/09/19 15:35:41]

Ah I see, you meant not the whole test case but just indicator tests. That will
work.

     const std::vector<PolicyTestCase*>* policy_test_cases =
         test_cases.Get(*policy);
     ASSERT_TRUE(policy_test_cases) << "PolicyTestCase not found for "
                                    << *policy;
     for (std::vector<PolicyTestCase*>::const_iterator test_case =
              policy_test_cases->begin();
          test_case != policy_test_cases->end();
          ++test_case) {
       PolicyTestCase* policy_test_case = *test_case;
       if (!policy_test_case->IsSupported())
@@ skipping 120 matching lines @@
       }
     }
   }
 }
 
 INSTANTIATE_TEST_CASE_P(PolicyPrefIndicatorTestInstance,
                         PolicyPrefIndicatorTest,
                         testing::ValuesIn(SplitPoliciesIntoChunks(10)));
 
 }  // namespace policy