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"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/common/extension_builder.h"
 #include "grit/components_strings.h"
 #include "policy/policy_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 using testing::Return;
 using testing::_;
 
 namespace {
 
+struct UrlForFlag {

[bartfab (slow), 2015/09/23 17:17:13]

Nit: This is nifty but a bit over-engineered. A Boolean param will do.
PolicyUITest::url() can look at that bool and decide which URL to return.

[fhorschig, 2015/09/25 08:27:15]

Done.

+  bool has_flag;
+  const char* url;
+};
+
+const UrlForFlag kUrlsForFlags[] = {
+  { true, chrome::kChromeUIPolicyInternalsURL},

[bartfab (slow), 2015/09/23 17:17:13]

Nit: s/}/ }/

[fhorschig, 2015/09/25 08:27:15]

Done.

+  { false, chrome::kChromeUIPolicyURL}

[bartfab (slow), 2015/09/23 17:17:13]

Nit: s/}/ }/

[fhorschig, 2015/09/25 08:27:15]

Done.

+};
+
 std::vector<std::string> PopulateExpectedPolicy(
     const std::string& name,
     const std::string& value,
     const std::string& source,
     const policy::PolicyMap::Entry* metadata,
     bool unknown) {
   std::vector<std::string> expected_policy;
 
   // Populate expected scope.
   if (metadata) {
@@ skipping 30 matching lines @@
     expected_policy.push_back(l10n_util::GetStringUTF8(IDS_POLICY_UNSET));
 
   // Populate expected expanded policy value.
   expected_policy.push_back(value);
 
   return expected_policy;
 }
 
 }  // namespace
 
-class PolicyUITest : public InProcessBrowserTest {
+class PolicyUITest
+    : public InProcessBrowserTest,
+      public testing::WithParamInterface<UrlForFlag>  {
  public:
   PolicyUITest();
   ~PolicyUITest() override;
 
+  // InProcessBrowserTest implementation.

[bartfab (slow), 2015/09/23 17:17:13]

Nit: The new style is simply // InProcessBrowserTest:

[fhorschig, 2015/09/25 08:27:15]

Done.

+  void SetUpCommandLine(base::CommandLine* command_line) override;
+
+  const char* url() const { return test_condition.url; }

[bartfab (slow), 2015/09/23 17:17:13]

Nit: Always pass around URLs as GURL instances.

[fhorschig, 2015/09/25 08:27:15]

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:
+  UrlForFlag test_condition;

[bartfab (slow), 2015/09/23 17:17:13]

Nit 1: Add _ suffix to member name.
Nit 2: Add blank line below.

[fhorschig, 2015/09/25 08:27:15]

Done.

   DISALLOW_COPY_AND_ASSIGN(PolicyUITest);
 };
 
 PolicyUITest::PolicyUITest() {
+  test_condition = GetParam();
 }
 
 PolicyUITest::~PolicyUITest() {
 }
 
+void PolicyUITest::SetUpCommandLine(base::CommandLine* command_line) {
+  InProcessBrowserTest::SetUpCommandLine(command_line);
+  if (test_condition.has_flag)
+    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(url()));
 
   // 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 27 matching lines @@
     ASSERT_TRUE(actual_policies->GetList(i, &actual_policy));
     ASSERT_EQ(expected_policy.size(), actual_policy->GetSize());
     for (size_t j = 0; j < expected_policy.size(); ++j) {
       std::string value;
       ASSERT_TRUE(actual_policy->GetString(j, &value));
       EXPECT_EQ(expected_policy[j], value);
     }
   }
 }
 
-IN_PROC_BROWSER_TEST_F(PolicyUITest, SendPolicyNames) {
+IN_PROC_BROWSER_TEST_P(PolicyUITest, SendPolicyNames) {
   // Verifies that the names of known policies are sent to the UI and processed
   // there correctly by checking that the policy table contains all policies in
   // the correct order.
 
   // Expect that the policy table contains all known policies in alphabetical
   // order and none of the policies have a set value.
   std::vector<std::vector<std::string> > expected_policies;
   policy::Schema chrome_schema =
       policy::Schema::Wrap(policy::GetChromeSchemaData());
   ASSERT_TRUE(chrome_schema.valid());
   for (policy::Schema::Iterator it = chrome_schema.GetPropertiesIterator();
        !it.IsAtEnd(); it.Advance()) {
     expected_policies.push_back(
         PopulateExpectedPolicy(
             it.key(), std::string(), std::string(), nullptr, false));
   }
 
   // Retrieve the contents of the policy table from the UI and verify that it
   // matches the expectation.
   VerifyPolicies(expected_policies);
 }
 
-IN_PROC_BROWSER_TEST_F(PolicyUITest, SendPolicyValues) {
+IN_PROC_BROWSER_TEST_P(PolicyUITest, SendPolicyValues) {
   // Verifies that policy values are sent to the UI and processed there
   // correctly by setting the values of four known and one unknown policy and
   // checking that the policy table contains the policy names, values and
   // metadata in the correct order.
   policy::PolicyMap values;
   std::map<std::string, std::string> expected_values;
 
   // Set the values of four existing policies.
   base::ListValue* restore_on_startup_urls = new base::ListValue;
   restore_on_startup_urls->Append(new base::StringValue("aaa"));
@@ skipping 67 matching lines @@
                              expected_values[kUnknownPolicy],
                              "Platform",
                              values.Get(kUnknownPolicy),
                              true));
 
   // Retrieve the contents of the policy table from the UI and verify that it
   // matches the expectation.
   VerifyPolicies(expected_policies);
 }
 
-IN_PROC_BROWSER_TEST_F(PolicyUITest, ExtensionLoadAndSendPolicy) {
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIPolicyURL));
+IN_PROC_BROWSER_TEST_P(PolicyUITest, ExtensionLoadAndSendPolicy) {
+  ui_test_utils::NavigateToURL(browser(), GURL(url()));
   base::ScopedTempDir temp_dir_;
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
   const std::string newly_added_policy_name = "new_policy";
   std::string json_data = "{\"type\": \"object\",\"properties\": {\"" +
                           newly_added_policy_name +
                           "\": { \"type\": \"string\"}}}";
 
   const std::string schema_file = "schema.json";
   base::FilePath schema_path = temp_dir_.path().AppendASCII(schema_file);
@@ skipping 31 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);
 }
+
+INSTANTIATE_TEST_CASE_P(WithFlagPolicyUITest,
+                        PolicyUITest,
+                        testing::Values(kUrlsForFlags[0]));
+
+INSTANTIATE_TEST_CASE_P(NoFlagPolicyUITest,
+                        PolicyUITest,
+                        testing::Values(kUrlsForFlags[1]));