Flag for Material Design policy construction page

chrome/browser/ui/webui/policy_ui_browsertest.cc

 // Copyright (c) 2013 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 <vector>
 
 #include "base/callback.h"
+#include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/mock_configuration_policy_provider.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_types.h"
 #include "components/policy/core/common/schema.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 59 matching lines @@
   return expected_policy;
 }
 
 }  // namespace
 
 class PolicyUITest : public InProcessBrowserTest {
  public:
   PolicyUITest();
   ~PolicyUITest() override;
 
+  void SetUpCommandLine(base::CommandLine* command_line) override;

[bartfab (slow), 2015/09/23 12:57:48]

Nit: // InProcessBrowserTest:

[fhorschig, 2015/09/23 16:18:26]

Done.

+
  protected:
   // InProcessBrowserTest implementation.
   void SetUpInProcessBrowserTestFixture() override;
 
   void UpdateProviderPolicy(const policy::PolicyMap& policy);
 
   void VerifyPolicies(const std::vector<std::vector<std::string> >& expected);
 
  protected:
   policy::MockConfigurationPolicyProvider provider_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PolicyUITest);
 };
 
 PolicyUITest::PolicyUITest() {
 }
 
 PolicyUITest::~PolicyUITest() {
 }
 
+void PolicyUITest::SetUpCommandLine(base::CommandLine* command_line) {
+  InProcessBrowserTest::SetUpCommandLine(command_line);
+  command_line->AppendSwitch(switches::kEnableMaterialDesignPolicyPage);
+}
+
 void PolicyUITest::SetUpInProcessBrowserTestFixture() {
   EXPECT_CALL(provider_, IsInitializationComplete(_))
       .WillRepeatedly(Return(true));
   policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_);
 }
 
 void PolicyUITest::UpdateProviderPolicy(const policy::PolicyMap& policy) {
   provider_.UpdateChromePolicy(policy);
   base::RunLoop loop;
   loop.RunUntilIdle();
 }
 
 void PolicyUITest::VerifyPolicies(
     const std::vector<std::vector<std::string> >& expected_policies) {
-  ui_test_utils::NavigateToURL(browser(), GURL("chrome://policy"));
+  ui_test_utils::NavigateToURL(browser(), GURL("chrome://policy-internal"));

[bartfab (slow), 2015/09/23 12:57:48]

Since the MD page is not on by default yet, we need to continue testing that the
current default works as expected. The best way to do this here would be to
parameterize the test so that it runs twice, testing chrome://policy (with the
flat unset) and chrome://policy-internals (with the flag set).

[fhorschig, 2015/09/23 16:18:26]

Done.

 
   // Retrieve the text contents of the policy table cells for all policies.
   const std::string javascript =
       "var entries = document.querySelectorAll("
       "    'section.policy-table-section > * > tbody');"
       "var policies = [];"
       "for (var i = 0; i < entries.length; ++i) {"
       "  var items = entries[i].querySelectorAll('tr > td');"
       "  var values = [];"
       "  for (var j = 0; j < items.length; ++j) {"
@@ skipping 191 matching lines @@
         PopulateExpectedPolicy(
             it.key(), std::string(), std::string(), nullptr, false));
   }
   // Add newly added policy to expected policy list.
   expected_policies.push_back(PopulateExpectedPolicy(
       newly_added_policy_name, std::string(), std::string(), nullptr, false));
 
   // Verify if policy UI includes policy that extension have.
   VerifyPolicies(expected_policies);
 }