Refactor extension event distribution to use Values instead of JSON strings.

chrome/browser/extensions/settings/settings_frontend.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/settings_frontend.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
+#include "base/json/json_reader.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/settings/leveldb_settings_storage_factory.h"
 #include "chrome/browser/extensions/settings/settings_backend.h"
 #include "chrome/browser/extensions/settings/sync_or_local_value_store_cache.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/storage.h"
 #include "content/public/browser/browser_thread.h"
 
@@ skipping 11 matching lines @@
 // processes for |profile| and its incognito partner if it exists.
 class DefaultObserver : public SettingsObserver {
  public:
   explicit DefaultObserver(Profile* profile) : profile_(profile) {}
 
   // SettingsObserver implementation.
   virtual void OnSettingsChanged(
       const std::string& extension_id,
       settings_namespace::Namespace settings_namespace,
       const std::string& change_json) OVERRIDE {
+    // TODO(gdk): This is a temporary hack while the refactoring for
+    // string-based event payloads is removed. http://crbug.com/136045
+    scoped_ptr<ListValue> args(new ListValue());
+    args->Append(base::JSONReader::Read(change_json));
+    args->Append(Value::CreateStringValue(settings_namespace::ToString(
+        settings_namespace)));
+
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
-        extension_id,
-        event_names::kOnSettingsChanged,
-        // This is the list of function arguments to pass to the onChanged
-        // handler of extensions, an array of [changes, settings_namespace].
-        std::string("[") + change_json + ",\"" +
-            settings_namespace::ToString(settings_namespace) + "\"]",
-        NULL,
+        extension_id, event_names::kOnSettingsChanged, args.Pass(), NULL,
         GURL());
   }
 
  private:
   Profile* const profile_;
 };
 
 SettingsStorageQuotaEnforcer::Limits GetLocalLimits() {
   SettingsStorageQuotaEnforcer::Limits limits = {
     static_cast<size_t>(api::storage::local::QUOTA_BYTES),
@@ skipping 141 matching lines @@
   CacheMap::iterator it = caches_.find(settings_namespace);
   if (it != caches_.end()) {
     ValueStoreCache* cache = it->second;
     cache->ShutdownOnUI();
     cache->GetMessageLoop()->DeleteSoon(FROM_HERE, cache);
     caches_.erase(it);
   }
 }
 
 }  // namespace extensions