Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / sync_file_system_internals / file_metadata_handler.cc

diff --git a/src/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc b/src/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc
index b3487a7..d4cfb9d 100644 (file)
--- a/src/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc
+++ b/src/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc
@@ -17,7 +17,6 @@
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "extensions/common/extension.h"
-#include "grit/sync_file_system_internals_resources.h"
 
 using sync_file_system::RemoteFileSyncService;
 using sync_file_system::SyncFileSystemServiceFactory;
@@ -56,22 +55,29 @@ void FileMetadataHandler::GetFileMetadata(
       extension_id);
 
   // Get all metadata for the one specific origin.
-  SyncFileSystemServiceFactory::GetForProfile(profile_)->DumpFiles(
-      origin,
-      base::Bind(&FileMetadataHandler::DidGetFileMetadata,
-                 weak_factory_.GetWeakPtr()));
+  sync_file_system::SyncFileSystemService* sync_service =
+      SyncFileSystemServiceFactory::GetForProfile(profile_);
+  if (!sync_service)
+    return;
+  sync_service->DumpFiles(origin,
+                          base::Bind(&FileMetadataHandler::DidGetFileMetadata,
+                                     weak_factory_.GetWeakPtr()));
 }
 
 void FileMetadataHandler::GetExtensions(const base::ListValue* args) {
   DCHECK(args);
-  base::ListValue list;
-  ExtensionStatusesHandler::GetExtensionStatusesAsDictionary(profile_, &list);
+  ExtensionStatusesHandler::GetExtensionStatusesAsDictionary(
+      profile_,
+      base::Bind(&FileMetadataHandler::DidGetExtensions,
+                 weak_factory_.GetWeakPtr()));
+}
+
+void FileMetadataHandler::DidGetExtensions(const base::ListValue& list) {
   web_ui()->CallJavascriptFunction("FileMetadata.onGetExtensions", list);
 }
 
-void FileMetadataHandler::DidGetFileMetadata(const base::ListValue* files) {
-  DCHECK(files);
-  web_ui()->CallJavascriptFunction("FileMetadata.onGetFileMetadata", *files);
+void FileMetadataHandler::DidGetFileMetadata(const base::ListValue& files) {
+  web_ui()->CallJavascriptFunction("FileMetadata.onGetFileMetadata", files);
 }
 
 }  // namespace syncfs_internals