Extend TwoClientExtensionSettingsSyncTest to test app settings.

chrome/browser/extensions/settings/syncable_settings_storage.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/extensions/settings/syncable_settings_storage.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/settings/settings_namespace.h"
 #include "chrome/browser/extensions/settings/settings_sync_util.h"
 #include "chrome/browser/sync/api/sync_data.h"
@@ skipping 148 matching lines @@
   return OverwriteLocalSettingsWithSync(sync_state, maybe_settings.settings());
 }
 
 SyncError SyncableSettingsStorage::SendLocalSettingsToSync(
     const DictionaryValue& settings) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(sync_processor_);
 
   SyncChangeList changes;
   for (DictionaryValue::Iterator it(settings); it.HasNext(); it.Advance()) {
-    changes.push_back(
-        settings_sync_util::CreateAdd(extension_id_, it.key(), it.value()));
+    changes.push_back(settings_sync_util::CreateAdd(
+        extension_id_, it.key(), it.value(), sync_type_));
   }
 
   if (changes.empty()) {
     return SyncError();
   }
 
   SyncError error = sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
   if (error.IsSet()) {
     StopSyncing();
     return error;
@@ skipping 22 matching lines @@
       if (sync_value->Equals(&it.value())) {
         // Sync and local values are the same, no changes to send.
         synced_keys_.insert(it.key());
       } else {
         // Sync value is different, update local setting with new value.
         changes.push_back(
             SettingSyncData(
                 SyncChange::ACTION_UPDATE,
                 extension_id_,
                 it.key(),
-                sync_value.release()));
+                sync_value.Pass()));
       }
     } else {
       // Not synced, delete local setting.
       changes.push_back(
           SettingSyncData(
               SyncChange::ACTION_DELETE,
               extension_id_,
               it.key(),
-              new DictionaryValue()));
+              scoped_ptr<Value>(new DictionaryValue())));
     }
   }
 
   // Add all new settings to local settings.
   while (!new_sync_state->empty()) {
     std::string key = *new_sync_state->begin_keys();
     Value* value = NULL;
     CHECK(new_sync_state->RemoveWithoutPathExpansion(key, &value));
     changes.push_back(
         SettingSyncData(
-            SyncChange::ACTION_ADD, extension_id_, key, value));
+            SyncChange::ACTION_ADD,
+            extension_id_,
+            key,
+            scoped_ptr<Value>(value)));
   }
 
   if (changes.empty()) {
     return SyncError();
   }
   return ProcessSyncChanges(changes);
 }
 
 void SyncableSettingsStorage::StopSyncing() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ skipping 111 matching lines @@
   std::set<std::string> added_keys;
   std::set<std::string> deleted_keys;
 
   for (SettingChangeList::const_iterator it = changes.begin();
       it != changes.end(); ++it) {
     const std::string& key = it->key();
     const Value* value = it->new_value();
     if (value) {
       if (synced_keys_.count(key)) {
         // New value, key is synced; send ACTION_UPDATE.
-        sync_changes.push_back(
-            settings_sync_util::CreateUpdate(
-                extension_id_, key, *value));
+        sync_changes.push_back(settings_sync_util::CreateUpdate(
+            extension_id_, key, *value, sync_type_));
       } else {
         // New value, key is not synced; send ACTION_ADD.
-        sync_changes.push_back(
-            settings_sync_util::CreateAdd(
-                extension_id_, key, *value));
+        sync_changes.push_back(settings_sync_util::CreateAdd(
+            extension_id_, key, *value, sync_type_));
         added_keys.insert(key);
       }
     } else {
       if (synced_keys_.count(key)) {
         // Clearing value, key is synced; send ACTION_DELETE.
-        sync_changes.push_back(
-            settings_sync_util::CreateDelete(extension_id_, key));
+        sync_changes.push_back(settings_sync_util::CreateDelete(
+            extension_id_, key, sync_type_));
         deleted_keys.insert(key);
       } else {
         LOG(WARNING) << "Deleted " << key << " but not in synced_keys_";
       }
     }
   }
 
   if (sync_changes.empty()) {
     return;
   }
@@ skipping 61 matching lines @@
         FROM_HERE,
         std::string("Error pushing sync remove to local settings: ") +
             result.error(),
         sync_type_);
   }
   changes->push_back(SettingChange(key, old_value, NULL));
   return SyncError();
 }
 
 }  // namespace extensions