Move the check for fileBrowserHandler permission to FileBrowserHandler.

chrome/common/extensions/api/file_browser_handlers/file_browser_handler.cc

 // Copyright 2013 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/common/extensions/api/file_browser_handlers/file_browser_handler.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
+#include "extensions/common/permissions/api_permission.h"
+#include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/url_pattern.h"
 #include "url/url_constants.h"
 
 namespace keys = extensions::manifest_keys;
 namespace errors = extensions::manifest_errors;
 
 namespace {
 
 const char kReadAccessString[] = "read";
 const char kReadWriteAccessString[] = "read-write";
@@ skipping 82 matching lines @@
 }
 
 bool FileBrowserHandler::HasCreateAccessPermission() const {
   DCHECK(!(file_access_permission_flags_ & kInvalidPermission));
   return (file_access_permission_flags_ & kCreatePermission) != 0;
 }
 
 // static
 FileBrowserHandler::List*
 FileBrowserHandler::GetHandlers(const extensions::Extension* extension) {
-  FileBrowserHandlerInfo* info = static_cast<FileBrowserHandlerInfo*>(
+  // Manifest is parsed before permissions are loaded, so file browser handlers

[Yoyo Zhou, 2015/03/25 20:37:09]

I'm not sure I follow. The manifest gets deserialized from JSON first, but the
permissions get loaded first (before parsing of manifest handlers), otherwise
you wouldn't have permissions_data. See Extension::InitFromValue.

[mtomasz, 2015/03/26 01:11:45]

Done per offline discussion.

+  // have to be loaded even though the permission is missing. Hence, check here
+  // for the permission and prevent returning it, if it is missing.
+  if (!extension->permissions_data()->HasAPIPermission(
+          extensions::APIPermission::kFileBrowserHandler)) {
+    return nullptr;
+  }
+  FileBrowserHandlerInfo* const info = static_cast<FileBrowserHandlerInfo*>(
       extension->GetManifestData(keys::kFileBrowserHandlers));
-  if (info)
-    return &info->file_browser_handlers;
-  return NULL;
+  if (!info)
+    return nullptr;
+
+  return &info->file_browser_handlers;
 }
 
 FileBrowserHandlerParser::FileBrowserHandlerParser() {
 }
 
 FileBrowserHandlerParser::~FileBrowserHandlerParser() {
 }
 
 namespace {
 
@@ skipping 149 matching lines @@
     return false;  // Failed to parse file browser actions definition.
   }
 
   extension->SetManifestData(keys::kFileBrowserHandlers, info.release());
   return true;
 }
 
 const std::vector<std::string> FileBrowserHandlerParser::Keys() const {
   return SingleKey(keys::kFileBrowserHandlers);
 }