sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference

sync/syncable/model_type.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 "sync/internal_api/public/base/model_type.h"
 
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "sync/protocol/app_notification_specifics.pb.h"
 #include "sync/protocol/app_setting_specifics.pb.h"
@@ skipping 102 matching lines @@
     case SUPERVISED_USERS:
       specifics->mutable_managed_user();
       break;
     case SUPERVISED_USER_SHARED_SETTINGS:
       specifics->mutable_managed_user_shared_setting();
       break;
     case ARTICLES:
       specifics->mutable_article();
       break;
     case ENHANCED_BOOKMARKS:
       specifics->mutable_enhanced_bookmark();

[stevenjb, 2014/10/24 17:35:18]

break;

+    case WIFI_CREDENTIALS:
+      specifics->mutable_wifi_credential();
       break;
     default:
       NOTREACHED() << "No known extension for model type.";
   }
 }
 
 ModelType GetModelTypeFromSpecificsFieldNumber(int field_number) {
   ModelTypeSet protocol_types = ProtocolTypes();
   for (ModelTypeSet::Iterator iter = protocol_types.First(); iter.Good();
        iter.Inc()) {
@@ skipping 60 matching lines @@
     case SUPERVISED_USER_SETTINGS:
       return sync_pb::EntitySpecifics::kManagedUserSettingFieldNumber;
     case SUPERVISED_USERS:
       return sync_pb::EntitySpecifics::kManagedUserFieldNumber;
     case SUPERVISED_USER_SHARED_SETTINGS:
       return sync_pb::EntitySpecifics::kManagedUserSharedSettingFieldNumber;
     case ARTICLES:
       return sync_pb::EntitySpecifics::kArticleFieldNumber;
     case ENHANCED_BOOKMARKS:
       return sync_pb::EntitySpecifics::kEnhancedBookmarkFieldNumber;
+    case WIFI_CREDENTIALS:
+      return sync_pb::EntitySpecifics::kWifiCredentialFieldNumber;
     default:
       NOTREACHED() << "No known extension for model type.";
       return 0;
   }
 }
 
 FullModelTypeSet ToFullModelTypeSet(ModelTypeSet in) {
   FullModelTypeSet out;
   for (ModelTypeSet::Iterator i = in.First(); i.Good(); i.Inc()) {
     out.Put(i.Get());
@@ skipping 111 matching lines @@
 
   if (specifics.has_managed_user_shared_setting())
     return SUPERVISED_USER_SHARED_SETTINGS;
 
   if (specifics.has_article())
     return ARTICLES;
 
   if (specifics.has_enhanced_bookmark())
     return ENHANCED_BOOKMARKS;
 
+  if (specifics.has_wifi_credential())
+    return WIFI_CREDENTIALS;
+
   return UNSPECIFIED;
 }
 
 ModelTypeSet ProtocolTypes() {
   ModelTypeSet set = ModelTypeSet::All();
   set.RemoveAll(ProxyTypes());
   return set;
 }
 
 ModelTypeSet UserTypes() {
@@ skipping 12 matching lines @@
   // Although the order doesn't technically matter here, it's clearer to keep
   // these in the same order as their definition in the ModelType enum.
   set.Put(BOOKMARKS);
   set.Put(PREFERENCES);
   set.Put(PASSWORDS);
   set.Put(AUTOFILL);
   set.Put(THEMES);
   set.Put(TYPED_URLS);
   set.Put(EXTENSIONS);
   set.Put(APPS);
+  set.Put(WIFI_CREDENTIALS);
   set.Put(PROXY_TABS);
   return set;
 }
 
 bool IsUserSelectableType(ModelType model_type) {
   return UserSelectableTypes().Has(model_type);
 }
 
 ModelTypeSet EncryptableUserTypes() {
   ModelTypeSet encryptable_user_types = UserTypes();
@@ skipping 152 matching lines @@
     case SUPERVISED_USER_SETTINGS:
       return "Managed User Settings";
     case SUPERVISED_USERS:
       return "Managed Users";
     case SUPERVISED_USER_SHARED_SETTINGS:
       return "Managed User Shared Settings";
     case ARTICLES:
       return "Articles";
     case ENHANCED_BOOKMARKS:
       return "Enhanced Bookmarks";
+    case WIFI_CREDENTIALS:
+      return "WiFi Credentials";
     case PROXY_TABS:
       return "Tabs";
     default:
       break;
   }
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
 }
 
 // The normal rules about histograms apply here.  Always append to the bottom of
@@ skipping 61 matching lines @@
     case ARTICLES:
       return 28;
     case APP_LIST:
       return 29;
     case SUPERVISED_USER_SHARED_SETTINGS:
       return 30;
     case SYNCED_NOTIFICATION_APP_INFO:
       return 31;
     case ENHANCED_BOOKMARKS:
       return 32;
+    case WIFI_CREDENTIALS:
+      return 33;
     // Silence a compiler warning.
     case MODEL_TYPE_COUNT:
       return 0;
   }
   return 0;
 }
 
 base::StringValue* ModelTypeToValue(ModelType model_type) {
   if (model_type >= FIRST_REAL_MODEL_TYPE) {
     return new base::StringValue(ModelTypeToString(model_type));
@@ skipping 73 matching lines @@
   else if (model_type_string == "Favicon Tracking")
     return FAVICON_TRACKING;
   else if (model_type_string == "Managed User Settings")
     return SUPERVISED_USER_SETTINGS;
   else if (model_type_string == "Managed Users")
     return SUPERVISED_USERS;
   else if (model_type_string == "Managed User Shared Settings")
     return SUPERVISED_USER_SHARED_SETTINGS;
   else if (model_type_string == "Articles")
     return ARTICLES;
+  else if (model_type_string == "WiFi Credentials")
+    return WIFI_CREDENTIALS;
   else if (model_type_string == "Tabs")
     return PROXY_TABS;
   else if (model_type_string == "Enhanced Bookmarks")
     return ENHANCED_BOOKMARKS;
   else
     NOTREACHED() << "No known model type corresponding to "
                  << model_type_string << ".";
   return UNSPECIFIED;
 }
 
@@ skipping 106 matching lines @@
     case FAVICON_TRACKING:
       return "google_chrome_favicon_tracking";
     case SUPERVISED_USER_SETTINGS:
       return "google_chrome_managed_user_settings";
     case SUPERVISED_USERS:
       return "google_chrome_managed_users";
     case SUPERVISED_USER_SHARED_SETTINGS:
       return "google_chrome_managed_user_shared_settings";
     case ARTICLES:
       return "google_chrome_articles";
+    case WIFI_CREDENTIALS:
+      return "google_chrome_wifi_credentials";
     case PROXY_TABS:
       return std::string();
     case ENHANCED_BOOKMARKS:
       return "google_chrome_enhanced_bookmarks";
     default:
       break;
   }
   NOTREACHED() << "No known extension for model type.";
   return "INVALID";
 }
@@ skipping 240 matching lines @@
 
 bool IsProxyType(ModelType model_type) {
   return model_type >= FIRST_PROXY_TYPE && model_type <= LAST_PROXY_TYPE;
 }
 
 bool IsActOnceDataType(ModelType model_type) {
   return model_type == HISTORY_DELETE_DIRECTIVES;
 }
 
 }  // namespace syncer