ChromeOS: Per-user time zone: refactor tests first.

chrome/browser/ui/webui/options/preferences_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 "chrome/browser/ui/webui/options/preferences_browsertest.h"
 
 #include <stddef.h>
 
 #include <iostream>
 #include <memory>
@@ skipping 678 matching lines @@
   // List pref.
   pref_names_.push_back(chromeos::kAccountsPrefUsers);
   default_values_.push_back(base::MakeUnique<base::ListValue>());
 
   // Verify notifications when default values are in effect.
   SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
   VerifyObservedPrefs(observed_json, pref_names_, default_values_, "owner",
                       true, false);
 }
 
-// Verifies that initializing the JavaScript Preferences class fires the correct

[xiyuan, 2017/05/26 17:14:53]

Does this belong to this CL?

[Alexander Alekseev, 2017/05/26 18:06:21]

Done.

-// notifications in JavaScript for non-privileged pref values handled by the
-// CoreChromeOSOptionsHandler class.
-IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest,
-                       ChromeOSDeviceFetchNonPrivilegedPrefs) {
-  std::vector<std::unique_ptr<base::Value>> decorated_non_default_values;
-  std::string observed_json;
-
-  // Non-privileged string pref.
-  pref_names_.push_back(chromeos::kSystemTimezone);
-  default_values_.push_back(
-      base::MakeUnique<base::Value>("America/Los_Angeles"));
-  non_default_values_.push_back(
-      base::MakeUnique<base::Value>("America/New_York"));
-  decorated_non_default_values.push_back(
-      non_default_values_.back()->CreateDeepCopy());
-
-  // Verify notifications when default values are in effect.
-  SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
-  VerifyObservedPrefs(observed_json, pref_names_, default_values_,
-                      std::string(), false, false);
-
-  chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get();
-  cros_settings->Set(pref_names_[0], *non_default_values_[0]);
-
-  // Verify notifications when non-default values are in effect.
-  SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
-  VerifyObservedPrefs(observed_json, pref_names_, decorated_non_default_values,
-                      std::string(), false, false);
-}
-
 class ManagedPreferencesBrowserTest : public PreferencesBrowserTest {
  protected:
   // PreferencesBrowserTest implementation:
   void SetUpInProcessBrowserTestFixture() override {
     // Set up fake install attributes.
     std::unique_ptr<chromeos::StubInstallAttributes> attributes =
         base::MakeUnique<chromeos::StubInstallAttributes>();
     attributes->SetCloudManaged("example.com", "fake-id");
     policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(
         attributes.release());
@@ skipping 48 matching lines @@
   for (size_t i = 0; i < pref_names_.size(); ++i) {
     cros_settings->Set(pref_names_[i], *non_default_values_[i]);
   }
 
   // Verify notifications when mandatory values are in effect.
   SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
   VerifyObservedPrefs(observed_json, pref_names_, decorated_non_default_values,
                       "policy", true, false);
 }
 
-// Verifies that initializing the JavaScript Preferences class fires the correct
-// notifications in JavaScript for non-privileged pref values handled by the
-// CoreChromeOSOptionsHandler class for a managed device.
-IN_PROC_BROWSER_TEST_F(ManagedPreferencesBrowserTest,
-                       ChromeOSDeviceFetchNonPrivilegedPrefs) {
-  std::vector<std::unique_ptr<base::Value>> decorated_non_default_values;
-  std::string observed_json;
-
-  // Non-privileged string pref.
-  pref_names_.push_back(chromeos::kSystemTimezone);
-  non_default_values_.push_back(
-      base::MakeUnique<base::Value>("America/New_York"));
-  decorated_non_default_values.push_back(
-      non_default_values_.back()->CreateDeepCopy());
-
-  // Verify notifications when mandatory values are in effect.
-  chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get();
-  cros_settings->Set(pref_names_[0], *non_default_values_[0]);
-
-  SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
-  VerifyObservedPrefs(observed_json, pref_names_, decorated_non_default_values,
-                      std::string(), false, false);
-}
-
 namespace {
 
 const char* kUserProfilePath = "user_profile";
 
 }  // namespace
 
 class ProxyPreferencesBrowserTest : public PreferencesBrowserTest {
  public:
   void SetUpOnMainThread() override {
     SetupNetworkEnvironment();
@@ skipping 265 matching lines @@
                base::Value(3));
   SetProxyPref(chromeos::proxy_cros_settings_parser::kProxySocksPort,
                base::Value(4));
 
   VerifyCurrentProxyServer(
       "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4",
       onc::ONC_SOURCE_NONE);
 }
 
 #endif