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 "base/bind.h"
 #include "base/file_path.h"
+#include "base/json/json_reader.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/extensions/extension_event_names.h"
 #include "chrome/browser/extensions/extension_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/settings_namespace.h"
 #include "chrome/browser/extensions/settings/weak_unlimited_settings_storage.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/value_store/leveldb_value_store.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 {
+    ListValue* args = new ListValue();
+
+    // TODO(gdk): This is a temporary hack while the refactoring for
+    // string-based event payloads is removed. http://crbug.com/136045
+    args->Append(base::JSONReader::Read(change_json));
+    args->Append(Value::CreateStringValue(settings_namespace::ToString(
+        settings_namespace)));
+
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
         extension_id,
         extension_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) + "\"]",
+        args,
         NULL,
         GURL());
   }
 
  private:
   Profile* const profile_;
 };
 
 void CallbackWithSyncableService(
     const SettingsFrontend::SyncableServiceCallback& callback,
@@ skipping 279 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return observers_;
 }
 
 // BackendWrappers
 
 SettingsFrontend::BackendWrappers::BackendWrappers() {}
 SettingsFrontend::BackendWrappers::~BackendWrappers() {}
 
 }  // namespace extensions