Move handling of dialog preferences to Preferences class

chrome/browser/ui/webui/options/preferences_browsertest.cc

Index: chrome/browser/ui/webui/options/preferences_browsertest.cc
diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc
index ac6b680eb604f075c32c591c55ad57c0ad3e4c9f..76c81076eb6ef12e5b5210edc7ab87394dd78484 100644
--- a/chrome/browser/ui/webui/options/preferences_browsertest.cc
+++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc
@@ -11,21 +11,23 @@
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "chrome/browser/api/prefs/pref_service_base.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/content_client.h"
 #include "content/public/test/browser_test_utils.h"
 #include "googleurl/src/gurl.h"
 #include "policy/policy_constants.h"
-#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
@@ -34,12 +36,15 @@
 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
 #endif
 
+using testing::AllOf;
+using testing::Mock;
+using testing::Property;
 using testing::Return;
 
 namespace base {
 
 // Helper for using EXPECT_EQ() with base::Value.
-bool operator==(const base::Value& first, const base::Value& second) {
+bool operator==(const Value& first, const Value& second) {
   return first.Equals(&second);
 }
 
@@ -52,19 +57,19 @@ void PrintTo(const Value& value, std::ostream* stream) {
 
 }  // namespace base
 
+// Googlemock matcher for base::Value.
+MATCHER_P(EqualsValue, expected, "") {
+  return arg && arg->Equals(expected);
+}
+
 PreferencesBrowserTest::PreferencesBrowserTest() {
 }
 
-// Sets up a mock user policy provider.
-void PreferencesBrowserTest::SetUpInProcessBrowserTestFixture() {
-  EXPECT_CALL(policy_provider_, IsInitializationComplete())
-      .WillRepeatedly(Return(true));
-  policy::BrowserPolicyConnector::SetPolicyProviderForTesting(
-      &policy_provider_);
-};
+PreferencesBrowserTest::~PreferencesBrowserTest() {
+}
 
-// Navigates to the settings page, causing the JS preference handling classes to
-// be loaded and initialized.
+// Navigates to the settings page, causing the JavaScript pref handling code to
+// load and injects JavaScript testing code.
 void PreferencesBrowserTest::SetUpOnMainThread() {
   ui_test_utils::NavigateToURL(browser(),
                                GURL(chrome::kChromeUISettingsFrameURL));
@@ -72,266 +77,585 @@ void PreferencesBrowserTest::SetUpOnMainThread() {
   ASSERT_TRUE(web_contents);
   render_view_host_ = web_contents->GetRenderViewHost();
   ASSERT_TRUE(render_view_host_);
+  pref_change_registrar_.Init(
+      PrefServiceBase::ForProfile(browser()->profile()));
+  pref_service_ = browser()->profile()->GetPrefs();
+  ASSERT_TRUE(content::ExecuteJavaScript(render_view_host_, L"",
+      L"function TestEnv() {"
+      L"  this.sentinelName_ = 'profile.exited_cleanly';"
+      L"  this.prefs_ = [];"
+      L"  TestEnv.instance_ = this;"
+      L"}"
+      L""
+      L"TestEnv.handleEvent = function(event) {"
+      L"  var env = TestEnv.instance_;"
+      L"  var name = event.type;"
+      L"  env.removePrefListener_(name);"
+      L"  if (name == TestEnv.sentinelName_)"
+      L"    env.sentinelValue_ = event.value.value;"
+      L"  else"
+      L"    env.reply_[name] = event.value;"
+      L"  if (env.fetching_ && !--env.fetching_ ||"
+      L"      !env.fetching_ && name == env.sentinelName_) {"
+      L"    env.removePrefListeners_();"
+      L"    window.domAutomationController.send(JSON.stringify(env.reply_));"
+      L"    delete env.reply_;"
+      L"  }"
+      L"};"
+      L""
+      L"TestEnv.prototype = {"
+      L"  addPrefListener_: function(name) {"
+      L"    Preferences.getInstance().addEventListener(name,"
+      L"                                               TestEnv.handleEvent);"
+      L"  },"
+      L""
+      L"  addPrefListeners_: function() {"
+      L"    for (var i in this.prefs_)"
+      L"      this.addPrefListener_(this.prefs_[i]);"
+      L"  },"
+      L""
+      L"  removePrefListener_: function(name) {"
+      L"    Preferences.getInstance().removeEventListener(name,"
+      L"                                                  TestEnv.handleEvent);"
+      L"  },"
+      L""
+      L"  removePrefListeners_: function() {"
+      L"    for (var i in this.prefs_)"
+      L"      this.removePrefListener_(this.prefs_[i]);"
+      L"  },"
+      L""
+      L""
+      L"  addPref: function(name) {"
+      L"    this.prefs_.push(name);"
+      L"  },"
+      L""
+      L"  setupAndReply: function() {"
+      L"    this.reply_ = {};"
+      L"    Preferences.instance_ = new Preferences();"
+      L"    this.addPref(this.sentinelName_);"
+      L"    this.fetching_ = this.prefs_.length;"
+      L"    this.addPrefListeners_();"
+      L"    Preferences.getInstance().initialize();"
+      L"  },"
+      L""
+      L"  runAndReply: function(test) {"
+      L"    this.reply_ = {};"
+      L"    this.addPrefListeners_();"
+      L"    test();"
+      L"    this.sentinelValue_ = !this.sentinelValue_;"
+      L"    Preferences.setBooleanPref(this.sentinelName_, this.sentinelValue_,"
+      L"                               true);"
+      L"  },"
+      L""
+      L"  startObserving: function() {"
+      L"    this.reply_ = {};"
+      L"    this.addPrefListeners_();"
+      L"  },"
+      L""
+      L"  finishObservingAndReply: function() {"
+      L"    this.sentinelValue_ = !this.sentinelValue_;"
+      L"    Preferences.setBooleanPref(this.sentinelName_, this.sentinelValue_,"
+      L"                               true);"
+      L"  }"
+      L"};"));
+}
+
+// Forwards notifications received when pref values change in the backend.
+void PreferencesBrowserTest::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  ASSERT_EQ(chrome::NOTIFICATION_PREF_CHANGED, type);
+  ASSERT_EQ(pref_service_, content::Source<PrefService>(source).ptr());
+  std::string* name = content::Details<std::string>(details).ptr();
+  ASSERT_TRUE(name);
+  OnCommit(pref_service_->FindPreference(name->c_str()));
+}
+
+// Sets up a mock user policy provider.
+void PreferencesBrowserTest::SetUpInProcessBrowserTestFixture() {
+  EXPECT_CALL(policy_provider_, IsInitializationComplete())
+      .WillRepeatedly(Return(true));
+  policy::BrowserPolicyConnector::SetPolicyProviderForTesting(
+      &policy_provider_);
+};
+
+void PreferencesBrowserTest::TearDownInProcessBrowserTestFixture() {
+  DeleteValues(default_values_);
+  DeleteValues(non_default_values_);
+}
+
+void PreferencesBrowserTest::SetUserPolicies(
+    const std::vector<std::string>& names,
+    const std::vector<base::Value*>& values,
+    policy::PolicyLevel level) {
+  policy::PolicyMap map;
+  for (size_t i = 0; i < names.size(); ++i)
+    map.Set(names[i], level, policy::POLICY_SCOPE_USER, values[i]->DeepCopy());
+  policy_provider_.UpdateChromePolicy(map);
+}
+
+void PreferencesBrowserTest::ClearUserPolicies() {
+  policy::PolicyMap empty_policy_map;
+  policy_provider_.UpdateChromePolicy(empty_policy_map);
+}
+
+void PreferencesBrowserTest::SetUserValues(
+    const std::vector<std::string>& names,
+    const std::vector<base::Value*>& values) {
+  for (size_t i = 0; i < names.size(); ++i)
+    pref_service_->Set(names[i].c_str(), *values[i]);
 }
 
-void PreferencesBrowserTest::VerifyValue(const base::DictionaryValue* dict,
-                                         const std::string& key,
-                                         base::Value* expected) {
+void PreferencesBrowserTest::DeleteValues(std::vector<base::Value*>& values){
+  for (std::vector<base::Value*>::iterator value = values.begin();
+       value != values.end(); ++value)
+    delete *value;
+  values.clear();
+}
+
+void PreferencesBrowserTest::VerifyKeyValue(const base::DictionaryValue* dict,
+                                            const std::string& key,
+                                            base::Value* expected) {
   const base::Value* actual = NULL;
   EXPECT_TRUE(dict->Get(key, &actual)) << "Was checking key: " << key;
   EXPECT_EQ(*expected, *actual) << "Was checking key: " << key;
   delete expected;
 }
 
-void PreferencesBrowserTest::VerifyDict(const base::DictionaryValue* dict,
+void PreferencesBrowserTest::VerifyPref(const base::DictionaryValue* prefs,
+                                        const std::string& name,
                                         const base::Value* value,
                                         const std::string& controlledBy,
                                         bool disabled) {
-  VerifyValue(dict, "value", value->DeepCopy());
+  const base::Value* pref;
+  const base::DictionaryValue* dict;
+  ASSERT_TRUE(prefs->GetWithoutPathExpansion(name, &pref));
+  ASSERT_TRUE(pref->GetAsDictionary(&dict));
+  VerifyKeyValue(dict, "value", value->DeepCopy());
   if (!controlledBy.empty()) {
-    VerifyValue(dict, "controlledBy",
-                base::Value::CreateStringValue(controlledBy));
+    VerifyKeyValue(dict, "controlledBy",
+                   base::Value::CreateStringValue(controlledBy));
   } else {
     EXPECT_FALSE(dict->HasKey("controlledBy"));
   }
-
   if (disabled)
-    VerifyValue(dict, "disabled", base::Value::CreateBooleanValue(true));
+    VerifyKeyValue(dict, "disabled", base::Value::CreateBooleanValue(true));
   else if (dict->HasKey("disabled"))
-    VerifyValue(dict, "disabled", base::Value::CreateBooleanValue(false));
+    VerifyKeyValue(dict, "disabled", base::Value::CreateBooleanValue(false));
 }
 
-void PreferencesBrowserTest::VerifyPref(const base::DictionaryValue* prefs,
-                                        const std::string& name,
-                                        const base::Value* value,
-                                        const std::string& controlledBy,
-                                        bool disabled) {
-  const base::Value* pref;
-  const base::DictionaryValue* dict;
-  ASSERT_TRUE(prefs->Get(name, &pref));
-  ASSERT_TRUE(pref->GetAsDictionary(&dict));
-  VerifyDict(dict, value, controlledBy, disabled);
+void PreferencesBrowserTest::VerifyObservedPref(const std::string& json,
+                                                const std::string& name,
+                                                const base::Value* value,
+                                                const std::string& controlledBy,
+                                                bool disabled) {
+  scoped_ptr<base::Value> observed_value_ptr(base::JSONReader::Read(json));
+  const base::DictionaryValue* observed_dict;
+  ASSERT_TRUE(observed_value_ptr.get());
+  ASSERT_TRUE(observed_value_ptr->GetAsDictionary(&observed_dict));
+  VerifyPref(observed_dict, name, value, controlledBy, disabled);
 }
 
-void PreferencesBrowserTest::VerifyPrefs(
-    const base::DictionaryValue* prefs,
+void PreferencesBrowserTest::VerifyObservedPrefs(
+    const std::string& json,
     const std::vector<std::string>& names,
     const std::vector<base::Value*>& values,
     const std::string& controlledBy,
     bool disabled) {
-  ASSERT_EQ(names.size(), values.size());
+  scoped_ptr<base::Value> observed_value_ptr(base::JSONReader::Read(json));
+  const base::DictionaryValue* observed_dict;
+  ASSERT_TRUE(observed_value_ptr.get());
+  ASSERT_TRUE(observed_value_ptr->GetAsDictionary(&observed_dict));
   for (size_t i = 0; i < names.size(); ++i)
-    VerifyPref(prefs, names[i], values[i], controlledBy, disabled);
+    VerifyPref(observed_dict, names[i], values[i], controlledBy, disabled);
+}
+
+void PreferencesBrowserTest::ExpectNoCommit(const std::string& name) {
+  pref_change_registrar_.Add(name.c_str(), this);
+  EXPECT_CALL(*this, OnCommit(Property(&PrefService::Preference::name, name)))
+      .Times(0);
+}
+
+void PreferencesBrowserTest::ExpectSetCommit(const std::string& name,
+                                             const base::Value* value) {
+  pref_change_registrar_.Add(name.c_str(), this);
+  EXPECT_CALL(*this, OnCommit(AllOf(
+      Property(&PrefService::Preference::name, name),
+      Property(&PrefService::Preference::IsUserControlled, true),
+      Property(&PrefService::Preference::GetValue, EqualsValue(value)))));
+}
+
+void PreferencesBrowserTest::ExpectClearCommit(const std::string& name) {
+  pref_change_registrar_.Add(name.c_str(), this);
+  EXPECT_CALL(*this, OnCommit(AllOf(
+      Property(&PrefService::Preference::name, name),
+      Property(&PrefService::Preference::IsUserControlled, false))));
+}
+
+void PreferencesBrowserTest::VerifyAndClearExpectations() {
+  Mock::VerifyAndClearExpectations(this);
+  pref_change_registrar_.RemoveAll();
+}
+
+void PreferencesBrowserTest::SetupJavaScriptTestEnvironment(
+    const std::vector<std::string>& pref_names,
+    std::string* observed_json) const {
+  std::wstringstream javascript;
+  javascript << "var testEnv = new TestEnv();";
+  for (std::vector<std::string>::const_iterator name = pref_names.begin();
+       name != pref_names.end(); ++name)
+    javascript << "testEnv.addPref('" << name->c_str() << "');";
+  javascript << "testEnv.setupAndReply();";
+  std::string temp_observed_json;
+  if (!observed_json)
+    observed_json = &temp_observed_json;
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
+      render_view_host_, L"", javascript.str(), observed_json));
 }
 
 void PreferencesBrowserTest::VerifySetPref(const std::string& name,
                                            const std::string& type,
-                                           base::Value* set_value,
-                                           base::Value* expected_value) {
-  scoped_ptr<base::Value> set_value_ptr(set_value);
-  scoped_ptr<base::Value> expected_value_ptr(expected_value);
-  std::string set_value_json;
-  base::JSONWriter::Write(set_value, &set_value_json);
+                                           const base::Value* value,
+                                           bool commit) {
+  if (commit)
+    ExpectSetCommit(name, value);
+  else
+    ExpectNoCommit(name);
+  scoped_ptr<base::Value> commit_ptr(base::Value::CreateBooleanValue(commit));
+  std::string value_json;
+  std::string commit_json;
+  base::JSONWriter::Write(value, &value_json);
+  base::JSONWriter::Write(commit_ptr.get(), &commit_json);
+  std::wstringstream javascript;
+  javascript << "testEnv.runAndReply(function() {"
+             << "    Preferences.set" << type.c_str() << "Pref("
+             << "      '" << name.c_str() << "',"
+             << "      " << value_json.c_str() << ","
+             << "      " << commit_json.c_str() << ");});";
+  std::string observed_json;
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
+      render_view_host_, L"", javascript.str(), &observed_json));
+  VerifyObservedPref(observed_json, name, value, "", false);
+  VerifyAndClearExpectations();
+}
+
+void PreferencesBrowserTest::VerifyClearPref(const std::string& name,
+                                             const base::Value* value,
+                                             bool commit) {
+  if (commit)
+    ExpectClearCommit(name);
+  else
+    ExpectNoCommit(name);
+  scoped_ptr<base::Value> commit_ptr(base::Value::CreateBooleanValue(commit));
+  std::string commit_json;
+  base::JSONWriter::Write(commit_ptr.get(), &commit_json);
   std::wstringstream javascript;
-  javascript << "pref_changed_callback = function(notification) {"
-             << "  if (notification[0] == '" << name.c_str() << "') {"
-             << "    pref_changed_callback = function() {};"
-             << "    window.domAutomationController.send("
-             << "        JSON.stringify(notification[1]));"
-             << "  }"
-             << "};"
-             << "chrome.send('observePrefs', ['pref_changed_callback',"
-             << "    '" << name.c_str() << "']);"
-             << "Preferences.set" << type.c_str() << "Pref("
-             << "    '" << name.c_str() << "',"
-             << "    " << set_value_json.c_str() << ");";
-  std::string actual_json;
+  javascript << "testEnv.runAndReply(function() {"
+             << "    Preferences.clearPref("
+             << "      '" << name.c_str() << "',"
+             << "      " << commit_json.c_str() << ");});";
+  std::string observed_json;
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      render_view_host_, L"", javascript.str(), &actual_json));
-
-  base::Value* actual_value = base::JSONReader::Read(actual_json);
-  const base::DictionaryValue* actual_dict;
-  ASSERT_TRUE(actual_value);
-  ASSERT_TRUE(actual_value->GetAsDictionary(&actual_dict));
-  VerifyDict(actual_dict, expected_value ? expected_value : set_value,
-             "", false);
-}
-
-void PreferencesBrowserTest::FetchPrefs(const std::vector<std::string>& names,
-                                        base::DictionaryValue** prefs) {
-  *prefs = NULL;
-  base::ListValue args_list;
-  args_list.Append(base::Value::CreateStringValue("prefs_fetched_callback"));
-  for (std::vector<std::string>::const_iterator name = names.begin();
-       name != names.end(); ++name)
-    args_list.Append(base::Value::CreateStringValue(*name));
-  std::string args_json;
-  base::JSONWriter::Write(&args_list, &args_json);
+      render_view_host_, L"", javascript.str(), &observed_json));
+  VerifyObservedPref(observed_json, name, value, "recommended", false);
+  VerifyAndClearExpectations();
+}
+
+void PreferencesBrowserTest::VerifyCommit(const std::string& name,
+                                          const base::Value* value,
+                                          const std::string& controlledBy) {
   std::wstringstream javascript;
-  javascript << "prefs_fetched_callback = function(dict) {"
-             << "  window.domAutomationController.send(JSON.stringify(dict));"
-             << "};"
-             << "chrome.send('fetchPrefs', " << args_json.c_str() << ");";
+  javascript << "testEnv.runAndReply(function() {"
+             << "    Preferences.getInstance().commitPref("
+             << "        '" << name.c_str() << "');});";
+  std::string observed_json;
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
+      render_view_host_, L"", javascript.str(), &observed_json));
+  VerifyObservedPref(observed_json, name, value, controlledBy, false);
+}
+
+void PreferencesBrowserTest::VerifySetCommit(const std::string& name,
+                                             const base::Value* value) {
+  ExpectSetCommit(name, value);
+  VerifyCommit(name, value, "");
+  VerifyAndClearExpectations();
+}
+
+void PreferencesBrowserTest::VerifyClearCommit(const std::string& name,
+                                               const base::Value* value) {
+  ExpectClearCommit(name);
+  VerifyCommit(name, value, "recommended");
+  VerifyAndClearExpectations();
+}
 
-  std::string fetched_json;
+void PreferencesBrowserTest::VerifyRollback(const std::string& name,
+                                            const base::Value* value,
+                                            const std::string& controlledBy) {
+  ExpectNoCommit(name);
+  std::wstringstream javascript;
+  javascript << "testEnv.runAndReply(function() {"
+             << "    Preferences.getInstance().rollbackPref("
+             << "        '" << name.c_str() << "');});";
+  std::string observed_json;
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      render_view_host_, L"", javascript.str(), &fetched_json));
-  base::Value* fetched_value = base::JSONReader::Read(fetched_json);
-  base::DictionaryValue* fetched_dict;
-  ASSERT_TRUE(fetched_value);
-  ASSERT_TRUE(fetched_value->GetAsDictionary(&fetched_dict));
-  *prefs = fetched_dict;
+      render_view_host_, L"", javascript.str(), &observed_json));
+  VerifyObservedPref(observed_json, name, value, controlledBy, false);
+  VerifyAndClearExpectations();
 }
 
-void PreferencesBrowserTest::SetUserPolicies(
-    const std::vector<std::string>& names,
-    const std::vector<base::Value*>& values,
-    policy::PolicyLevel level) {
-  ASSERT_TRUE(names.size() == values.size());
-  policy::PolicyMap map;
-  for (size_t i = 0; i < names.size(); ++i)
-    map.Set(names[i], level, policy::POLICY_SCOPE_USER, values[i]->DeepCopy());
-  policy_provider_.UpdateChromePolicy(map);
+void PreferencesBrowserTest::StartObserving() {
+  ASSERT_TRUE(content::ExecuteJavaScript(
+      render_view_host_, L"", L"testEnv.startObserving();"));
 }
 
-void PreferencesBrowserTest::DeleteValues(std::vector<base::Value*>& values){
-  for (std::vector<base::Value*>::iterator value = values.begin();
-       value != values.end(); ++value)
-    delete *value;
-  values.clear();
+void PreferencesBrowserTest::FinishObserving(std::string* observed_json) {
+  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
+      render_view_host_, L"", L"testEnv.finishObservingAndReply();",
+      observed_json));
 }
 
-// Verifies that pref values received by observer callbacks are decorated
-// correctly when the prefs are set from JavaScript.
-IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, SetPrefs) {
-  // Prefs handled by CoreOptionsHandler.
-  VerifySetPref(prefs::kAlternateErrorPagesEnabled, "Boolean",
-                base::Value::CreateBooleanValue(false), NULL);
-  VerifySetPref(prefs::kRestoreOnStartup, "Integer",
-                base::Value::CreateIntegerValue(4), NULL);
-  VerifySetPref(prefs::kEnterpriseWebStoreName, "String",
-                base::Value::CreateStringValue("Store"), NULL);
-  VerifySetPref(prefs::kEnterpriseWebStoreURL, "URL",
-                base::Value::CreateStringValue("http://www.google.com"),
-                base::Value::CreateStringValue("http://www.google.com/"));
-}
-
-// Verifies that pref values are decorated correctly when fetched from
-// JavaScript.
-IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, FetchPrefs) {
-  // Pref names.
-  std::vector<std::string> pref_names;
+void PreferencesBrowserTest::UseDefaultTestPrefs(bool includeListPref) {
   // Boolean pref.
-  pref_names.push_back(prefs::kAlternateErrorPagesEnabled);
+  types_.push_back("Boolean");
+  pref_names_.push_back(prefs::kAlternateErrorPagesEnabled);
+  policy_names_.push_back(policy::key::kAlternateErrorPagesEnabled);
+  non_default_values_.push_back(base::Value::CreateBooleanValue(false));
+
   // Integer pref.
-  pref_names.push_back(prefs::kRestoreOnStartup);
+  types_.push_back("Integer");
+  pref_names_.push_back(prefs::kRestoreOnStartup);
+  policy_names_.push_back(policy::key::kRestoreOnStartup);
+  non_default_values_.push_back(base::Value::CreateIntegerValue(4));
+
   // String pref.
-  pref_names.push_back(prefs::kEnterpriseWebStoreName);
+  types_.push_back("String");
+  pref_names_.push_back(prefs::kEnterpriseWebStoreName);
+  policy_names_.push_back(policy::key::kEnterpriseWebStoreName);
+  non_default_values_.push_back(base::Value::CreateStringValue("Store"));
+
   // URL pref.
-  pref_names.push_back(prefs::kEnterpriseWebStoreURL);
+  types_.push_back("URL");
+  pref_names_.push_back(prefs::kEnterpriseWebStoreURL);
+  policy_names_.push_back(policy::key::kEnterpriseWebStoreURL);
+  non_default_values_.push_back(
+      base::Value::CreateStringValue("http://www.google.com/"));
+
   // List pref.
-  pref_names.push_back(prefs::kURLsToRestoreOnStartup);
-
-  // Corresponding policy names.
-  std::vector<std::string> policy_names;
-  policy_names.push_back(policy::key::kAlternateErrorPagesEnabled);
-  policy_names.push_back(policy::key::kRestoreOnStartup);
-  policy_names.push_back(policy::key::kEnterpriseWebStoreName);
-  policy_names.push_back(policy::key::kEnterpriseWebStoreURL);
-  policy_names.push_back(policy::key::kRestoreOnStartupURLs);
-
-  // Default values.
-  std::vector<base::Value*> values;
-  values.push_back(base::Value::CreateBooleanValue(true));
-#if defined(OS_CHROMEOS)
-  values.push_back(base::Value::CreateIntegerValue(1));
-#else
-  values.push_back(base::Value::CreateIntegerValue(5));
-#endif
-  values.push_back(base::Value::CreateStringValue(""));
-  values.push_back(base::Value::CreateStringValue(""));
-  values.push_back(new base::ListValue);
-
-  // Verify default values are fetched and decorated correctly.
-  base::DictionaryValue* fetched;
-  FetchPrefs(pref_names, &fetched);
-  if (fetched)
-    VerifyPrefs(fetched, pref_names, values, "", false);
-  delete fetched;
-
-  // Set recommended values.
-  DeleteValues(values);
-  values.push_back(base::Value::CreateBooleanValue(false));
-  values.push_back(base::Value::CreateIntegerValue(4));
-  values.push_back(base::Value::CreateStringValue("Store"));
-  values.push_back(base::Value::CreateStringValue("http://www.google.com"));
-  base::ListValue* list = new base::ListValue;
-  list->Append(base::Value::CreateStringValue("http://www.google.com"));
-  list->Append(base::Value::CreateStringValue("http://example.com"));
-  values.push_back(list);
-  SetUserPolicies(policy_names, values, policy::POLICY_LEVEL_RECOMMENDED);
+  if (includeListPref) {
+    types_.push_back("List");
+    pref_names_.push_back(prefs::kURLsToRestoreOnStartup);
+    policy_names_.push_back(policy::key::kRestoreOnStartupURLs);
+    base::ListValue* list = new base::ListValue;
+    list->Append(base::Value::CreateStringValue("http://www.google.com"));
+    list->Append(base::Value::CreateStringValue("http://example.com"));
+    non_default_values_.push_back(list);
+  }
 
-  // Verify recommended values are fetched and decorated correctly.
-  FetchPrefs(pref_names, &fetched);
-  if (fetched)
-    VerifyPrefs(fetched, pref_names, values, "recommended", false);
-  delete fetched;
+  // Retrieve default values.
+  for (std::vector<std::string>::const_iterator name = pref_names_.begin();
+        name != pref_names_.end(); ++name) {
+    default_values_.push_back(
+        pref_service_->GetDefaultPrefValue(name->c_str())->DeepCopy());
+  }
+}
 
-  // Set mandatory values.
-  SetUserPolicies(policy_names, values, policy::POLICY_LEVEL_MANDATORY);
+// Verifies that initializing the JavaScript Preferences class fires the correct
+// notifications in JavaScript.
+IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, FetchPrefs) {
+  UseDefaultTestPrefs(true);
+  std::string observed_json;
+
+  // Verify notifications when default values are in effect.
+  SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
+  VerifyObservedPrefs(observed_json, pref_names_, default_values_, "", false);
+
+  // Verify notifications when recommended values are in effect.
+  SetUserPolicies(policy_names_, non_default_values_,
+                  policy::POLICY_LEVEL_RECOMMENDED);
+  SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
+  VerifyObservedPrefs(observed_json, pref_names_, non_default_values_,
+                      "recommended", false);
+
+  // Verify notifications when mandatory values are in effect.
+  SetUserPolicies(policy_names_, non_default_values_,
+                  policy::POLICY_LEVEL_MANDATORY);
+  SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
+  VerifyObservedPrefs(observed_json, pref_names_, non_default_values_,
+                      "policy", true);
+
+  // Verify notifications when user-modified values are in effect.
+  ClearUserPolicies();
+  SetUserValues(pref_names_, non_default_values_);
+  SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
+  VerifyObservedPrefs(observed_json, pref_names_, non_default_values_,
+                      "", false);
+}
 
-  // Verify mandatory values are fetched and decorated correctly.
-  FetchPrefs(pref_names, &fetched);
-  if (fetched)
-    VerifyPrefs(fetched, pref_names, values, "policy", true);
-  delete fetched;
+// Verifies that setting a user-modified pref value through the JavaScript
+// Preferences class fires the correct notification in JavaScript and causes the
+// change to be committed to the C++ backend.
+IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, SetPrefs) {
+  UseDefaultTestPrefs(false);
 
-  DeleteValues(values);
+  ASSERT_NO_FATAL_FAILURE(SetupJavaScriptTestEnvironment(pref_names_, NULL));
+  for (size_t i = 0; i < pref_names_.size(); ++i)
+    VerifySetPref(pref_names_[i], types_[i], non_default_values_[i], true);
+}
+
+// Verifies that clearing a user-modified pref value through the JavaScript
+// Preferences class fires the correct notification in JavaScript and causes the
+// change to be committed to the C++ backend.
+IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, ClearPrefs) {
+  UseDefaultTestPrefs(false);
+
+  SetUserPolicies(policy_names_, default_values_,
+                  policy::POLICY_LEVEL_RECOMMENDED);
+  SetUserValues(pref_names_, non_default_values_);
+  ASSERT_NO_FATAL_FAILURE(SetupJavaScriptTestEnvironment(pref_names_, NULL));
+  for (size_t i = 0; i < pref_names_.size(); ++i)
+    VerifyClearPref(pref_names_[i], default_values_[i], true);
+}
+
+// Verifies that when the user-modified value of a dialog pref is set and the
+// change then committed through the JavaScript Preferences class, the correct
+// notifications fire and a commit to the C++ backend occurs in the latter step
+// only.
+IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, DialogPrefsSetCommit) {
+  UseDefaultTestPrefs(false);
+
+  ASSERT_NO_FATAL_FAILURE(SetupJavaScriptTestEnvironment(pref_names_, NULL));
+  for (size_t i = 0; i < pref_names_.size(); ++i) {
+    VerifySetPref(pref_names_[i], types_[i], non_default_values_[i], false);
+    VerifySetCommit(pref_names_[i], non_default_values_[i]);
+  }
+}
+
+// Verifies that when the user-modified value of a dialog pref is set and the
+// change then rolled back through the JavaScript Preferences class, the correct
+// notifications fire and no commit to the C++ backend occurs.
+IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, DialogPrefsSetRollback) {
+  UseDefaultTestPrefs(false);
+
+  // Verify behavior when default values are in effect.
+  ASSERT_NO_FATAL_FAILURE(SetupJavaScriptTestEnvironment(pref_names_, NULL));
+  for (size_t i = 0; i < pref_names_.size(); ++i) {
+    VerifySetPref(pref_names_[i], types_[i], non_default_values_[i], false);
+    VerifyRollback(pref_names_[i], default_values_[i], "");
+  }
+
+  // Verify behavior when recommended values are in effect.
+  SetUserPolicies(policy_names_, default_values_,
+                  policy::POLICY_LEVEL_RECOMMENDED);
+  ASSERT_NO_FATAL_FAILURE(SetupJavaScriptTestEnvironment(pref_names_, NULL));
+  for (size_t i = 0; i < pref_names_.size(); ++i) {
+    VerifySetPref(pref_names_[i], types_[i], non_default_values_[i], false);
+    VerifyRollback(pref_names_[i], default_values_[i], "recommended");
+  }
+}
+
+// Verifies that when the user-modified value of a dialog pref is cleared and
+// the change then committed through the JavaScript Preferences class, the
+// correct notifications fire and a commit to the C++ backend occurs in the
+// latter step only.
+IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, DialogPrefsClearCommit) {
+  UseDefaultTestPrefs(false);
+
+  SetUserPolicies(policy_names_, default_values_,
+                  policy::POLICY_LEVEL_RECOMMENDED);
+  SetUserValues(pref_names_, non_default_values_);
+  ASSERT_NO_FATAL_FAILURE(SetupJavaScriptTestEnvironment(pref_names_, NULL));
+  for (size_t i = 0; i < pref_names_.size(); ++i) {
+    VerifyClearPref(pref_names_[i], default_values_[i], false);
+    VerifyClearCommit(pref_names_[i], default_values_[i]);
+  }
+}
+
+// Verifies that when the user-modified value of a dialog pref is cleared and
+// the change then rolled back through the JavaScript Preferences class, the
+// correct notifications fire and no commit to the C++ backend occurs.
+IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, DialogPrefsClearRollback) {
+  UseDefaultTestPrefs(false);
+
+  SetUserPolicies(policy_names_, default_values_,
+                  policy::POLICY_LEVEL_RECOMMENDED);
+  SetUserValues(pref_names_, non_default_values_);
+  ASSERT_NO_FATAL_FAILURE(SetupJavaScriptTestEnvironment(pref_names_, NULL));
+  for (size_t i = 0; i < pref_names_.size(); ++i) {
+    VerifyClearPref(pref_names_[i], default_values_[i], false);
+    VerifyRollback(pref_names_[i], non_default_values_[i], "");
+  }
+}
+
+// Verifies that when preference values change in the C++ backend, the correct
+// notifications fire in JavaScript.
+IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, NotificationsOnBackendChanges) {
+  UseDefaultTestPrefs(false);
+  std::string observed_json;
+
+  ASSERT_NO_FATAL_FAILURE(SetupJavaScriptTestEnvironment(pref_names_, NULL));
+
+  // Verify notifications when recommended values come into effect.
+  StartObserving();
+  SetUserPolicies(policy_names_, non_default_values_,
+                  policy::POLICY_LEVEL_RECOMMENDED);
+  FinishObserving(&observed_json);
+  VerifyObservedPrefs(observed_json, pref_names_, non_default_values_,
+                      "recommended", false);
+
+  // Verify notifications when mandatory values come into effect.
+  StartObserving();
+  SetUserPolicies(policy_names_, non_default_values_,
+                  policy::POLICY_LEVEL_MANDATORY);
+  FinishObserving(&observed_json);
+  VerifyObservedPrefs(observed_json, pref_names_, non_default_values_,
+                      "policy", true);
+
+  // Verify notifications when default values come into effect.
+  StartObserving();
+  ClearUserPolicies();
+  FinishObserving(&observed_json);
+  VerifyObservedPrefs(observed_json, pref_names_, default_values_, "", false);
+
+  // Verify notifications when user-modified values come into effect.
+  StartObserving();
+  SetUserValues(pref_names_, non_default_values_);
+  FinishObserving(&observed_json);
+  VerifyObservedPrefs(observed_json, pref_names_, non_default_values_,
+                      "", false);
 }
 
 #if defined(OS_CHROMEOS)
-// Verifies that pref values handled by the CoreChromeOSOptionsHandler class
-// are decorated correctly when requested from JavaScript.
+
+// Verifies that initializing the JavaScript Preferences class fires the correct
+// notifications in JavaScript for pref values handled by the
+// CoreChromeOSOptionsHandler class.
 IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, ChromeOSDeviceFetchPrefs) {
-  // Pref names.
-  std::vector<std::string> names;
+  std::vector<base::Value*> decorated_non_default_values;
+  std::string observed_json;
+
   // Boolean pref.
-  names.push_back(chromeos::kAccountsPrefAllowGuest);
+  pref_names_.push_back(chromeos::kAccountsPrefAllowGuest);
+  default_values_.push_back(base::Value::CreateBooleanValue(true));
+  non_default_values_.push_back(base::Value::CreateBooleanValue(false));
+  decorated_non_default_values.push_back(
+      non_default_values_.back()->DeepCopy());
+
   // String pref.
-  names.push_back(chromeos::kReleaseChannel);
+  pref_names_.push_back(chromeos::kReleaseChannel);
+  default_values_.push_back(base::Value::CreateStringValue(""));
+  non_default_values_.push_back(
+      base::Value::CreateStringValue("stable-channel"));
+  decorated_non_default_values.push_back(
+      non_default_values_.back()->DeepCopy());
+
   // List pref.
-  names.push_back(chromeos::kAccountsPrefUsers);
-
-  // Default pref values.
-  std::vector<base::Value*> values;
-  values.push_back(base::Value::CreateBooleanValue(true));
-  values.push_back(base::Value::CreateStringValue(""));
-  values.push_back(new base::ListValue);
-
-  // Verify default values are fetched and decorated correctly.
-  base::DictionaryValue* fetched;
-  FetchPrefs(names, &fetched);
-  if (fetched)
-    VerifyPrefs(fetched, names, values, "", true);
-  delete fetched;
-
-  // Set mandatory values.
-  DeleteValues(values);
-  values.push_back(base::Value::CreateBooleanValue(false));
-  values.push_back(base::Value::CreateStringValue("stable-channel"));
+  pref_names_.push_back(chromeos::kAccountsPrefUsers);
+  default_values_.push_back(new base::ListValue);
   base::ListValue* list = new base::ListValue;
   list->Append(base::Value::CreateStringValue("me@google.com"));
   list->Append(base::Value::CreateStringValue("you@google.com"));
-  values.push_back(list);
-  ASSERT_EQ(names.size(), values.size());
-  chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get();
-  for (size_t i = 0; i < names.size(); ++i)
-    cros_settings->Set(names[i], *values[i]);
-
-  // Verify mandatory values are fetched and decorated correctly.
-  DeleteValues(values);
-  values.push_back(base::Value::CreateBooleanValue(false));
-  values.push_back(base::Value::CreateStringValue("stable-channel"));
+  non_default_values_.push_back(list);
   list = new base::ListValue;
   base::DictionaryValue* dict = new base::DictionaryValue;
   dict->SetString("username", "me@google.com");
@@ -345,68 +669,68 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, ChromeOSDeviceFetchPrefs) {
   dict->SetString("email", "");
   dict->SetBoolean("owner", false);
   list->Append(dict);
-  values.push_back(list);
-  FetchPrefs(names, &fetched);
+  decorated_non_default_values.push_back(list);
+
+  // Verify notifications when default values are in effect.
+  SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
+  VerifyObservedPrefs(observed_json, pref_names_, default_values_, "", true);
+
+  // Verify notifications when mandatory values are in effect.
+  chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get();
+  for (size_t i = 0; i < pref_names_.size(); ++i)
+    cros_settings->Set(pref_names_[i], *non_default_values_[i]);
   // FIXME(bartfab): Find a way to simulate enterprise enrollment in browser
   // tests. Only if Chrome thinks that it is enrolled will the device prefs be
   // decorated with "controlledBy: policy".
-  if (fetched)
-    VerifyPrefs(fetched, names, values, "", true);
-  delete fetched;
+  SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
+  VerifyObservedPrefs(observed_json, pref_names_, decorated_non_default_values,
+                      "", true);
 
-  DeleteValues(values);
+  DeleteValues(decorated_non_default_values);
 }
 
-// Verifies that pref values handled by the Chrome OS proxy settings parser are
-// decorated correctly when requested from JavaScript.
+// Verifies that initializing the JavaScript Preferences class fires the correct
+// notifications in JavaScript for pref values handled by the Chrome OS proxy
+// settings parser.
 IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, ChromeOSProxyFetchPrefs) {
-  // Pref names.
-  std::vector<std::string> names;
+  std::string observed_json;
+
   // Boolean pref.
-  names.push_back(chromeos::kProxySingle);
+  pref_names_.push_back(chromeos::kProxySingle);
+  default_values_.push_back(base::Value::CreateBooleanValue(false));
+  non_default_values_.push_back(base::Value::CreateBooleanValue(true));
+
   // Integer pref.
-  names.push_back(chromeos::kProxySingleHttpPort);
+  pref_names_.push_back(chromeos::kProxySingleHttpPort);
+  default_values_.push_back(base::Value::CreateStringValue(""));
+  non_default_values_.push_back(base::Value::CreateIntegerValue(8080));
+
   // String pref.
-  names.push_back(chromeos::kProxySingleHttp);
+  pref_names_.push_back(chromeos::kProxySingleHttp);
+  default_values_.push_back(base::Value::CreateStringValue(""));
+  non_default_values_.push_back(base::Value::CreateStringValue("127.0.0.1"));
+
   // List pref.
-  names.push_back(chromeos::kProxyIgnoreList);
-
-  // Default values.
-  std::vector<base::Value*> values;
-  values.push_back(base::Value::CreateBooleanValue(false));
-  values.push_back(base::Value::CreateStringValue(""));
-  values.push_back(base::Value::CreateStringValue(""));
-  values.push_back(new base::ListValue());
-
-  // Verify default values are fetched and decorated correctly.
-  base::DictionaryValue* fetched;
-  FetchPrefs(names, &fetched);
-  if (fetched)
-    VerifyPrefs(fetched, names, values, "", false);
-  delete fetched;
-
-  // Set user-modified values.
-  DeleteValues(values);
-  values.push_back(base::Value::CreateBooleanValue(true));
-  values.push_back(base::Value::CreateIntegerValue(8080));
-  values.push_back(base::Value::CreateStringValue("127.0.0.1"));
+  pref_names_.push_back(chromeos::kProxyIgnoreList);
+  default_values_.push_back(new base::ListValue());
   base::ListValue* list = new base::ListValue();
   list->Append(base::Value::CreateStringValue("www.google.com"));
   list->Append(base::Value::CreateStringValue("example.com"));
-  values.push_back(list);
-  ASSERT_EQ(names.size(), values.size());
+  non_default_values_.push_back(list);
+
+  // Verify notifications when default values are in effect.
+  SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
+  VerifyObservedPrefs(observed_json, pref_names_, default_values_, "", false);
+
+  // Verify notifications when user-modified values are in effect.
   Profile* profile = browser()->profile();
   // Do not set the Boolean pref. It will toogle automatically.
-  for (size_t i = 1; i < names.size(); ++i)
+  for (size_t i = 1; i < pref_names_.size(); ++i)
     chromeos::proxy_cros_settings_parser::SetProxyPrefValue(
-        profile, names[i], values[i]->DeepCopy());
-
-  // Verify user-modified values are fetched and decorated correctly.
-  FetchPrefs(names, &fetched);
-  if (fetched)
-    VerifyPrefs(fetched, names, values, "", false);
-  delete fetched;
-
-  DeleteValues(values);
+        profile, pref_names_[i], non_default_values_[i]->DeepCopy());
+  SetupJavaScriptTestEnvironment(pref_names_, &observed_json);
+  VerifyObservedPrefs(observed_json, pref_names_, non_default_values_,
+                      "", false);
 }
+
 #endif