[Sync] Add priority preferences datatype for mobile

chrome/browser/sync/profile_sync_service_android.cc

 // Copyright 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 "chrome/browser/sync/profile_sync_service_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 49 matching lines @@
   PROXY_TABS = 1 << 7,
   FAVICON_IMAGE = 1 << 8,
   FAVICON_TRACKING = 1 << 9,
   NIGORI = 1 << 10,
   DEVICE_INFO = 1 << 11,
   EXPERIMENTS = 1 << 12,
   SUPERVISED_USER_SETTING = 1 << 13,
   SUPERVISED_USER_WHITELIST = 1 << 14,
   AUTOFILL_WALLET = 1 << 15,
   AUTOFILL_WALLET_METADATA = 1 << 16,
+  PREFERENCE = 1 << 17,
+  PRIORITY_PREFERENCE = 1 << 18,
 };
 
 // Native callback for the JNI GetAllNodes method. When
 // ProfileSyncService::GetAllNodes completes, this method is called and the
 // results are sent to the Java callback.
 void NativeGetAllNodesCallback(
     const base::android::ScopedJavaGlobalRef<jobject>& callback,
     scoped_ptr<base::ListValue> result) {
   JNIEnv* env = base::android::AttachCurrentThread();
   std::string json_string;
@@ skipping 333 matching lines @@
   if (model_type_selection & AUTOFILL)
     types.Put(syncer::AUTOFILL);
   if (model_type_selection & BOOKMARK)
     types.Put(syncer::BOOKMARKS);
   if (model_type_selection & PASSWORD)
     types.Put(syncer::PASSWORDS);
   if (model_type_selection & PROXY_TABS)
     types.Put(syncer::PROXY_TABS);
   if (model_type_selection & TYPED_URL)
     types.Put(syncer::TYPED_URLS);
+  if (model_type_selection & PREFERENCE)
+    types.Put(syncer::PREFERENCES);
   DCHECK(syncer::UserSelectableTypes().HasAll(types));
   sync_service_->OnUserChoseDatatypes(sync_everything, types);
 }
 
 void ProfileSyncServiceAndroid::SetSetupInProgress(
     JNIEnv* env, jobject obj, jboolean in_progress) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   sync_service_->SetSetupInProgress(in_progress);
 }
 
@@ skipping 84 matching lines @@
   }
   if (types.Has(syncer::AUTOFILL_WALLET_DATA)) {
     model_type_selection |= AUTOFILL_WALLET;
   }
   if (types.Has(syncer::AUTOFILL_WALLET_METADATA)) {
     model_type_selection |= AUTOFILL_WALLET_METADATA;
   }
   if (types.Has(syncer::PASSWORDS)) {
     model_type_selection |= PASSWORD;
   }
+  if (types.Has(syncer::PREFERENCES)) {
+    model_type_selection |= PREFERENCE;
+  }
+  if (types.Has(syncer::PRIORITY_PREFERENCES)) {
+    model_type_selection |= PRIORITY_PREFERENCE;
+  }
   if (types.Has(syncer::TYPED_URLS)) {
     model_type_selection |= TYPED_URL;
   }
   if (types.Has(syncer::SESSIONS)) {
     model_type_selection |= SESSION;
   }
   if (types.Has(syncer::HISTORY_DELETE_DIRECTIVES)) {
     model_type_selection |= HISTORY_DELETE_DIRECTIVE;
   }
   if (types.Has(syncer::PROXY_TABS)) {
@@ skipping 44 matching lines @@
   ProfileSyncServiceAndroid* profile_sync_service_android =
       new ProfileSyncServiceAndroid(env, obj);
   profile_sync_service_android->Init();
   return reinterpret_cast<intptr_t>(profile_sync_service_android);
 }
 
 // static
 bool ProfileSyncServiceAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }