Connect MediaFileSystemRegistry with MediaGalleriesPreferences

chrome/browser/extensions/api/media_galleries/media_galleries_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.
 
 // Implements the Chrome Extensions Media Galleries API.
 
 #include "chrome/browser/extensions/api/media_galleries/media_galleries_api.h"
 
 #include <string>
 #include <vector>
@@ skipping 61 matching lines @@
   MediaGalleries::GetMediaFileSystemsInteractivity interactive = "no";
   if (params->details.get() && params->details->interactive.get())
     interactive = *params->details->interactive;
 
   if (interactive == "yes") {
     ShowDialog();
     return true;
   } else if (interactive == "if_needed") {
     std::vector<MediaFileSystemRegistry::MediaFSInfo> filesystems =
         MediaFileSystemRegistry::GetInstance()->GetMediaFileSystemsForExtension(
-            render_view_host()->GetProcess(), *GetExtension());
+            render_view_host(), GetExtension());
     if (filesystems.empty())
       ShowDialog();
     else
       ReturnGalleries(filesystems);
 
     return true;
   } else if (interactive == "no") {
     GetAndReturnGalleries();
     return true;
   }
 
   error_ = kInvalidInteractive;
   return false;
 }
 
 void MediaGalleriesGetMediaFileSystemsFunction::GetAndReturnGalleries() {
   std::vector<MediaFileSystemRegistry::MediaFSInfo> filesystems =
       MediaFileSystemRegistry::GetInstance()->GetMediaFileSystemsForExtension(
-          render_view_host()->GetProcess(), *GetExtension());
+          render_view_host(), GetExtension());
   ReturnGalleries(filesystems);
 }
 
 void MediaGalleriesGetMediaFileSystemsFunction::ReturnGalleries(
     const std::vector<MediaFileSystemRegistry::MediaFSInfo>& filesystems) {
   const int child_id = render_view_host()->GetProcess()->GetID();
   base::ListValue* list = new base::ListValue();
   for (size_t i = 0; i < filesystems.size(); i++) {
     base::DictionaryValue* dict_value = new base::DictionaryValue();
     dict_value->SetWithoutPathExpansion(
         "fsid", Value::CreateStringValue(filesystems[i].fsid));
     // The directory name is not exposed to the js layer.
     dict_value->SetWithoutPathExpansion(
         "name", Value::CreateStringValue(filesystems[i].name));
     list->Append(dict_value);
 
-    if (GetExtension()->HasAPIPermission(
+    if (!filesystems[i].path.empty() && GetExtension()->HasAPIPermission(
             extensions::APIPermission::kMediaGalleriesRead)) {
       content::ChildProcessSecurityPolicy* policy =
           ChildProcessSecurityPolicy::GetInstance();
       if (!policy->CanReadFile(child_id, filesystems[i].path))
         policy->GrantReadFile(child_id, filesystems[i].path);
       policy->GrantReadFileSystem(child_id, filesystems[i].fsid);
     }
     // TODO(vandebo) Handle write permission.
   }
 
@@ skipping 31 matching lines @@
 bool MediaGalleriesAssembleMediaFileFunction::RunImpl() {
   if (!ApiIsAccessible(&error_))
     return false;
 
   // TODO(vandebo) Update the metadata and return the new file.
   SetResult(Value::CreateNullValue());
   return true;
 }
 
 }  // namespace extensions