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

chrome/browser/chromeos/extensions/file_browser_event_router.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/chromeos/extensions/file_browser_event_router.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 357 matching lines @@
 }
 
 void FileBrowserEventRouter::OnNetworkManagerChanged(
     chromeos::NetworkLibrary* network_library) {
   if (!profile_ || !profile_->GetExtensionEventRouter()) {
     NOTREACHED();
     return;
   }
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
       extensions::event_names::kOnFileBrowserNetworkConnectionChanged,
-      "[]", NULL, GURL());
+      scoped_ptr<ListValue>(new ListValue()), NULL, GURL());
 }
 
 void FileBrowserEventRouter::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (!profile_ || !profile_->GetExtensionEventRouter()) {
     NOTREACHED();
     return;
   }
@@ skipping 11 matching lines @@
         LOG(INFO) << "Unmounting " << it->second.mount_path
                   << " because of policy.";
         manager->UnmountPath(it->second.mount_path);
       }
       return;
     } else if (*pref_name == prefs::kDisableGDataOverCellular ||
         *pref_name == prefs::kDisableGDataHostedFiles ||
         *pref_name == prefs::kDisableGData) {
       profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
           extensions::event_names::kOnFileBrowserGDataPreferencesChanged,
-          "[]", NULL, GURL());
+          scoped_ptr<ListValue>(new ListValue()), NULL, GURL());
     }
   }
 }
 
 void FileBrowserEventRouter::OnProgressUpdate(
     const std::vector<gdata::GDataOperationRegistry::ProgressStatus>& list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   scoped_ptr<ListValue> event_list(
       file_manager_util::ProgressStatusVectorToListValue(
           profile_,
           file_manager_util::GetFileBrowserExtensionUrl().GetOrigin(),
           list));
 
-  ListValue args;
-  args.Append(event_list.release());
-
-  std::string args_json;
-  base::JSONWriter::Write(&args,
-                          &args_json);
+  scoped_ptr<ListValue> args(new ListValue());
+  args->Append(event_list.release());
 
   profile_->GetExtensionEventRouter()->DispatchEventToExtension(
       std::string(kFileBrowserDomain),
-      extensions::event_names::kOnFileTransfersUpdated, args_json,
-      NULL, GURL());
+      extensions::event_names::kOnFileTransfersUpdated, args.Pass(), NULL,
+      GURL());
 }
 
 void FileBrowserEventRouter::OnDirectoryChanged(
     const FilePath& directory_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   HandleFileWatchNotification(directory_path, false);
 }
 
 void FileBrowserEventRouter::OnDocumentFeedFetched(
     int num_accumulated_entries) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  ListValue args;
-  args.Append(base::Value::CreateIntegerValue(num_accumulated_entries));
-  std::string args_json;
-  base::JSONWriter::Write(&args, &args_json);
+  scoped_ptr<ListValue> args(new ListValue());
+  args->Append(base::Value::CreateIntegerValue(num_accumulated_entries));
 
   profile_->GetExtensionEventRouter()->DispatchEventToExtension(
       std::string(kFileBrowserDomain),
-      extensions::event_names::kOnDocumentFeedFetched, args_json,
-      NULL, GURL());
+      extensions::event_names::kOnDocumentFeedFetched, args.Pass(), NULL,
+      GURL());
 }
 
 void FileBrowserEventRouter::OnFileSystemMounted() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   MountDrive(base::Bind(&base::DoNothing));  // Callback does nothing.
 }
 
 void FileBrowserEventRouter::OnFileSystemBeingUnmounted() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 42 matching lines @@
     return;
   }
 
   for (ExtensionUsageRegistry::const_iterator iter = extensions.begin();
        iter != extensions.end(); ++iter) {
     GURL target_origin_url(extensions::Extension::GetBaseURLFromExtensionId(
         iter->first));
     GURL base_url = fileapi::GetFileSystemRootURI(target_origin_url,
         fileapi::kFileSystemTypeExternal);
     GURL target_file_url = GURL(base_url.spec() + virtual_path.value());
-    ListValue args;
+    scoped_ptr<ListValue> args(new ListValue());
     DictionaryValue* watch_info = new DictionaryValue();
-    args.Append(watch_info);
+    args->Append(watch_info);
     watch_info->SetString("fileUrl", target_file_url.spec());
     watch_info->SetString("eventType",
                           got_error ? kPathWatchError : kPathChanged);
 
-    std::string args_json;
-    base::JSONWriter::Write(&args, &args_json);
-
     profile_->GetExtensionEventRouter()->DispatchEventToExtension(
-        iter->first, extensions::event_names::kOnFileChanged, args_json,
-        NULL, GURL());
+        iter->first, extensions::event_names::kOnFileChanged, args.Pass(), NULL,
+        GURL());
   }
 }
 
 // TODO(tbarzic): This is not used anymore. Remove it.
 void FileBrowserEventRouter::DispatchDiskEvent(
     const DiskMountManager::Disk* disk, bool added) {
   if (!profile_) {
     NOTREACHED();
     return;
   }
 
-  ListValue args;
+  scoped_ptr<ListValue> args(new ListValue());
   DictionaryValue* mount_info = new DictionaryValue();
-  args.Append(mount_info);
+  args->Append(mount_info);
   mount_info->SetString("eventType",
                         added ? kDiskAddedEventType : kDiskRemovedEventType);
   DictionaryValue* disk_info = DiskToDictionaryValue(disk);
   mount_info->Set("volumeInfo", disk_info);
 
-  std::string args_json;
-  base::JSONWriter::Write(&args, &args_json);
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
-      extensions::event_names::kOnFileBrowserDiskChanged, args_json, NULL,
+      extensions::event_names::kOnFileBrowserDiskChanged, args.Pass(), NULL,
       GURL());
 }
 
 void FileBrowserEventRouter::DispatchMountCompletedEvent(
     DiskMountManager::MountEvent event,
     chromeos::MountError error_code,
     const DiskMountManager::MountPointInfo& mount_info) {
   if (!profile_ || mount_info.mount_type == chromeos::MOUNT_TYPE_INVALID) {
     NOTREACHED();
     return;
   }
 
-  ListValue args;
+  scoped_ptr<ListValue> args(new ListValue());
   DictionaryValue* mount_info_value = new DictionaryValue();
-  args.Append(mount_info_value);
+  args->Append(mount_info_value);
   mount_info_value->SetString("eventType",
       event == DiskMountManager::MOUNTING ? "mount" : "unmount");
   mount_info_value->SetString("status", MountErrorToString(error_code));
   mount_info_value->SetString(
       "mountType",
       DiskMountManager::MountTypeToString(mount_info.mount_type));
 
   // Add sourcePath to the event.
   mount_info_value->SetString("sourcePath", mount_info.source_path);
 
@@ skipping 12 matching lines @@
       mount_info_value->SetString("mountPath",
                                   "/" + relative_mount_path.value());
       relative_mount_path_set = true;
     } else {
       LOG(ERROR) << "Mount path is not accessible: " << mount_info.mount_path;
       mount_info_value->SetString("status",
           MountErrorToString(chromeos::MOUNT_ERROR_PATH_UNMOUNTED));
     }
   }
 
-  std::string args_json;
-  base::JSONWriter::Write(&args, &args_json);
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
-      extensions::event_names::kOnFileBrowserMountCompleted, args_json, NULL,
+      extensions::event_names::kOnFileBrowserMountCompleted, args.Pass(), NULL,
       GURL());
 
   // Do not attempt to open File Manager while the login is in progress or
   // the screen is locked.
   if (chromeos::BaseLoginDisplayHost::default_host() ||
       chromeos::ScreenLocker::default_screen_locker())
     return;
 
   if (relative_mount_path_set &&
       mount_info.mount_type == chromeos::MOUNT_TYPE_DEVICE &&
@@ skipping 256 matching lines @@
   return scoped_refptr<RefcountedProfileKeyedService>(
       new FileBrowserEventRouter(profile));
 }
 
 bool FileBrowserEventRouterFactory::ServiceHasOwnInstanceInIncognito() {
   // Explicitly and always allow this router in guest login mode.   see
   // chrome/browser/profiles/profile_keyed_base_factory.h comment
   // for the details.
   return true;
 }