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

chrome/browser/extensions/system/system_api.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/system/system_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 31 matching lines @@
 const char kUpdatingState[] = "Updating";
 const char kNeedRestartState[] = "NeedRestart";
 
 // Event names.
 const char kOnBrightnessChanged[] = "systemPrivate.onBrightnessChanged";
 const char kOnVolumeChanged[] = "systemPrivate.onVolumeChanged";
 const char kOnScreenUnlocked[] = "systemPrivate.onScreenUnlocked";
 const char kOnWokeUp[] = "systemPrivate.onWokeUp";
 
 // Dispatches an extension event with |args|
-void DispatchEvent(const std::string& event_name, const ListValue& args) {
+void DispatchEvent(const std::string& event_name, base::Value* argument) {
   Profile* profile = ProfileManager::GetDefaultProfile();
   if (!profile)
     return;
   ExtensionEventRouter* extension_event_router =
       profile->GetExtensionEventRouter();
   if (!extension_event_router)
     return;
-  std::string json_args;
-  base::JSONWriter::Write(&args, &json_args);
+
+  base::ListValue* list_args = new base::ListValue();

[miket_OOO, 2012/07/10 22:33:19]

Just args! They must all be the same!

+  list_args->Append(argument);
   extension_event_router->DispatchEventToRenderers(
-      event_name, json_args, NULL, GURL(), extensions::EventFilteringInfo());
+      event_name, list_args, NULL, GURL(), extensions::EventFilteringInfo());
 }
 
 }  // namespace
 
 namespace extensions {
 
 bool GetIncognitoModeAvailabilityFunction::RunImpl() {
   PrefService* prefs = profile_->GetPrefs();
   int value = prefs->GetInteger(prefs::kIncognitoModeAvailability);
   EXTENSION_FUNCTION_VALIDATE(
@@ skipping 59 matching lines @@
 #endif
   DictionaryValue* dict = new DictionaryValue();
   dict->SetString(kStateKey, state);
   dict->SetDouble(kDownloadProgressKey, download_progress);
   result_.reset(dict);
 
   return true;
 }
 
 void DispatchVolumeChangedEvent(double volume, bool is_volume_muted) {
-  ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetDouble(kVolumeKey, volume);
   dict->SetBoolean(kIsVolumeMutedKey, is_volume_muted);
-  args.Append(dict);
-  DispatchEvent(kOnVolumeChanged, args);
+  DispatchEvent(kOnVolumeChanged, dict);

[miket_OOO, 2012/07/10 22:33:19]

aaarrrrgs!

 }
 
 void DispatchBrightnessChangedEvent(int brightness, bool user_initiated) {
-  ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetInteger(kBrightnessKey, brightness);
   dict->SetBoolean(kUserInitiatedKey, user_initiated);
-  args.Append(dict);
-  DispatchEvent(kOnBrightnessChanged, args);
+  DispatchEvent(kOnBrightnessChanged, dict);
 }
 
 void DispatchScreenUnlockedEvent() {
-  ListValue args;
-  DispatchEvent(kOnScreenUnlocked, args);
+  DispatchEvent(kOnScreenUnlocked, NULL);
 }
 
 void DispatchWokeUpEvent() {
-  ListValue args;
-  DispatchEvent(kOnWokeUp, args);
+  DispatchEvent(kOnWokeUp, NULL);
 }
 
 }  // namespace extensions