sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference

chrome/browser/ui/webui/sync_setup_handler_unittest.cc

Index: chrome/browser/ui/webui/sync_setup_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
index 432de3eaea0b1f5c9019e5ffdd3dbd4aad703ede..69ec5e734162381b8bffefa159206b23acb83e1e 100644
--- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
@@ -91,6 +91,8 @@ std::string GetConfiguration(const base::DictionaryValue* extra_values,
   result.SetBoolean("tabsSynced", types.Has(syncer::PROXY_TABS));
   result.SetBoolean("themesSynced", types.Has(syncer::THEMES));
   result.SetBoolean("typedUrlsSynced", types.Has(syncer::TYPED_URLS));
+  result.SetBoolean("wifiCredentialsSynced",
+                    types.Has(syncer::WIFI_CREDENTIALS));
   std::string args;
   base::JSONWriter::Write(&result, &args);
   return args;
@@ -110,7 +112,7 @@ void CheckBool(const base::DictionaryValue* dictionary,
     bool actual_value;
     EXPECT_TRUE(dictionary->GetBoolean(key, &actual_value)) <<
         "No value found for " << key;
-    EXPECT_EQ(actual_value, expected_value) <<
+    EXPECT_EQ(expected_value, actual_value) <<
         "Mismatch found for " << key;
   }
 }
@@ -138,6 +140,8 @@ void CheckConfigDataTypeArguments(base::DictionaryValue* dictionary,
   CheckBool(dictionary, "tabsSynced", types.Has(syncer::PROXY_TABS));
   CheckBool(dictionary, "themesSynced", types.Has(syncer::THEMES));
   CheckBool(dictionary, "typedUrlsSynced", types.Has(syncer::TYPED_URLS));
+  CheckBool(dictionary, "wifiCredentialsSynced",
+            types.Has(syncer::WIFI_CREDENTIALS));
 }
 
 
@@ -923,6 +927,7 @@ TEST_F(SyncSetupHandlerTest, ShowSetupSyncEverything) {
   CheckBool(dictionary, "extensionsRegistered", true);
   CheckBool(dictionary, "passwordsRegistered", true);
   CheckBool(dictionary, "preferencesRegistered", true);
+  CheckBool(dictionary, "wifiCredentialsRegistered", true);
   CheckBool(dictionary, "tabsRegistered", true);
   CheckBool(dictionary, "themesRegistered", true);
   CheckBool(dictionary, "typedUrlsRegistered", true);