Separate the syncing of extension settings and app settings into separate data

chrome/browser/extensions/extension_settings_apitest.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_settings_backend.h"
 #include "chrome/browser/extensions/extension_settings_sync_util.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/sync/api/sync_change_processor.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 
 namespace {
@@ skipping 29 matching lines @@
   }
 
   void FinalReplyWhenSatisfied(
       const std::string& normal_action,
       const std::string& incognito_action) {
     MaybeLoadAndReplyWhenSatisfied(normal_action, incognito_action, NULL, true);
   }
 
   void InitSync(SyncChangeProcessor* sync_processor) {
     browser()->profile()->GetExtensionService()->
-        extension_settings_frontend()->RunWithBackend(base::Bind(
-            &ExtensionSettingsApiTest::InitSyncWithBackend,
-            this,
-            sync_processor));
+        extension_settings_frontend()->RunWithSyncableService(
+            // TODO(kalman): test both EXTENSION_SETTINGS and APP_SETTINGS.
+            syncable::EXTENSION_SETTINGS,
+            base::Bind(
+                &ExtensionSettingsApiTest::InitSyncWithSyncableService,
+                this,
+                sync_processor));
     MessageLoop::current()->RunAllPending();
   }
 
   void SendChanges(const SyncChangeList& change_list) {
     browser()->profile()->GetExtensionService()->
-        extension_settings_frontend()->RunWithBackend(base::Bind(
-            &ExtensionSettingsApiTest::SendChangesToBackend,
-            this,
-            change_list));
+        extension_settings_frontend()->RunWithSyncableService(
+            // TODO(kalman): test both EXTENSION_SETTINGS and APP_SETTINGS.
+            syncable::EXTENSION_SETTINGS,
+            base::Bind(
+                &ExtensionSettingsApiTest::SendChangesToSyncableService,
+                this,
+                change_list));
     MessageLoop::current()->RunAllPending();
   }
 
  private:
   const Extension* MaybeLoadAndReplyWhenSatisfied(
       const std::string& normal_action,
       const std::string& incognito_action,
       // May be NULL to imply not loading the extension.
       const std::string* extension_dir,
       bool is_final_action) {
@@ skipping 19 matching lines @@
 
   std::string CreateMessage(const std::string& action, bool is_final_action) {
     scoped_ptr<DictionaryValue> message(new DictionaryValue());
     message->SetString("action", action);
     message->SetBoolean("isFinalAction", is_final_action);
     std::string message_json;
     base::JSONWriter::Write(message.get(), false, &message_json);
     return message_json;
   }
 
-  void InitSyncWithBackend(
-      SyncChangeProcessor* sync_processor, ExtensionSettingsBackend* backend) {
-    EXPECT_FALSE(backend->MergeDataAndStartSyncing(
+  void InitSyncWithSyncableService(
+      SyncChangeProcessor* sync_processor, SyncableService* settings_service) {
+    EXPECT_FALSE(settings_service->MergeDataAndStartSyncing(
         syncable::EXTENSION_SETTINGS,
         SyncDataList(),
         sync_processor).IsSet());
   }
 
-  void SendChangesToBackend(
-      const SyncChangeList& change_list, ExtensionSettingsBackend* backend) {
-    EXPECT_FALSE(backend->ProcessSyncChanges(FROM_HERE, change_list).IsSet());
+  void SendChangesToSyncableService(
+      const SyncChangeList& change_list, SyncableService* settings_service) {
+    EXPECT_FALSE(
+        settings_service->ProcessSyncChanges(FROM_HERE, change_list).IsSet());
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionSettingsApiTest, SimpleTest) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
   ASSERT_TRUE(RunExtensionTest("settings/simple_test")) << message_;
 }
 
 // Structure of this test taken from IncognitoSplitMode.
@@ skipping 86 matching lines @@
   sync_changes.push_back(extension_settings_sync_util::CreateDelete(
       extension_id, "foo"));
   SendChanges(sync_changes);
 
   FinalReplyWhenSatisfied(
       "assertDeleteFooNotification", "assertDeleteFooNotification");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message();
 }