Enable sync for the settings from the Extension Settings API.

chrome/browser/extensions/extension_settings_ui_wrapper.cc

Index: chrome/browser/extensions/extension_settings_ui_wrapper.cc
diff --git a/chrome/browser/extensions/extension_settings_ui_wrapper.cc b/chrome/browser/extensions/extension_settings_ui_wrapper.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fc60156cb2d5218fcd044bde6020914909e01dd2
--- /dev/null
+++ b/chrome/browser/extensions/extension_settings_ui_wrapper.cc
@@ -0,0 +1,99 @@
+// 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 "chrome/browser/extensions/extension_settings_ui_wrapper.h"
+
+#include "base/bind.h"
+#include "content/browser/browser_thread.h"
+
+ExtensionSettingsUIWrapper::ExtensionSettingsUIWrapper(
+    const FilePath& base_path)
+    : core_(new ExtensionSettingsUIWrapper::Core(base_path)) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+}
+
+void ExtensionSettingsUIWrapper::RunWithStorage(
+    const std::string& extension_id, const Callback& callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  BrowserThread::PostTask(
+      BrowserThread::FILE,
+      FROM_HERE,
+      base::Bind(
+          &ExtensionSettingsUIWrapper::Core::RunWithStorageOnFileThread,
+          core_.get(),
+          extension_id,
+          callback));
+}
+
+SyncableService* ExtensionSettingsUIWrapper::GetSyncableService() {
+  return core_.get();

[akalin, 2011/09/20 14:53:11]

DCHECK ui thread

[not at google - send to devlin, 2011/09/21 00:20:14]

Done.

[not at google - send to devlin, 2011/09/21 01:44:00]

Actually this can't work that way it's structured.  GetSyncableService is called
from CreateExtensionSyncComponents which is called on the FILE thread because of
the whole NonFrontendDataTypeController thing causing
ExtensionSettingsDataTypeController::CreateSyncComponents to be run on the FILE
thread.

So as it stands, this patch causes sync to crash.  I'll change this to asserting
it's on the FILE thread but that makes the whole Core delegating sync calls to
the underlying ExtensionSettings rather unnecessary.  In the meantime... I'll
think... ideas?

+}
+
+ExtensionSettingsUIWrapper::~ExtensionSettingsUIWrapper() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+}
+
+ExtensionSettingsUIWrapper::Core::Core(const FilePath& base_path)
+    : extension_settings_(NULL) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  BrowserThread::PostTask(
+      BrowserThread::FILE,
+      FROM_HERE,
+      base::Bind(
+          &ExtensionSettingsUIWrapper::Core::InitOnFileThread,
+          this,
+          base_path));
+}
+
+void ExtensionSettingsUIWrapper::Core::RunWithStorageOnFileThread(
+    const std::string& extension_id, const Callback& callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK(extension_settings_);
+  callback.Run(extension_settings_->GetStorage(extension_id));
+}
+
+SyncDataList ExtensionSettingsUIWrapper::Core::GetAllSyncData(
+    syncable::ModelType type) const {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK(extension_settings_);
+  return extension_settings_->GetAllSyncData(type);
+}
+
+SyncError ExtensionSettingsUIWrapper::Core::MergeDataAndStartSyncing(
+    syncable::ModelType type,
+    const SyncDataList& initial_sync_data,
+    SyncChangeProcessor* sync_processor) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK(extension_settings_);
+  return extension_settings_->MergeDataAndStartSyncing(
+      type, initial_sync_data, sync_processor);
+}
+
+SyncError ExtensionSettingsUIWrapper::Core::ProcessSyncChanges(
+    const tracked_objects::Location& from_here,
+    const SyncChangeList& change_list) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK(extension_settings_);
+  return extension_settings_->ProcessSyncChanges(from_here, change_list);
+}
+
+void ExtensionSettingsUIWrapper::Core::StopSyncing(syncable::ModelType type) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK(extension_settings_);
+  extension_settings_->StopSyncing(type);
+}
+
+ExtensionSettingsUIWrapper::Core::~Core() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
+      BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  BrowserThread::DeleteSoon(
+      BrowserThread::FILE, FROM_HERE, extension_settings_);
+}
+
+void ExtensionSettingsUIWrapper::Core::InitOnFileThread(
+    const FilePath& base_path) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK(!extension_settings_);
+  extension_settings_ = new ExtensionSettings(base_path);
+}