Pepper: Simplify OpenResource() for Non-SFI.

ppapi/nacl_irt/manifest_service.cc

 // Copyright 2014 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 "ppapi/nacl_irt/manifest_service.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_sync_message_filter.h"
@@ skipping 19 matching lines @@
 }
 
 ManifestService::~ManifestService() {
 }
 
 void ManifestService::StartupInitializationComplete() {
   filter_->Send(new PpapiHostMsg_StartupInitializationComplete);
 }
 
 bool ManifestService::OpenResource(const char* file, int* fd) {
-  // OpenResource will return INVALID SerializedHandle, if it is not supported.
-  // Specifically, PNaCl doesn't support open resource.
   ppapi::proxy::SerializedHandle ipc_fd;
   if (!filter_->Send(new PpapiHostMsg_OpenResource(
-          std::string(kFilePrefix) + file, &ipc_fd)) ||
-      !ipc_fd.is_file()) {

[hidehiko, 2014/06/18 04:43:11]

Why this is removed?

[teravest, 2014/06/18 20:13:44]

That's some carryover from debugging. Restored.

+          std::string(kFilePrefix) + file, &ipc_fd))) {
     LOG(ERROR) << "ManifestService::OpenResource failed:" << file;
     *fd = -1;
     return false;
   }
 
   *fd = ipc_fd.descriptor().fd;
   return true;
 }
 
 int IrtOpenResource(const char* file, int* fd) {
   // Remove leading '/' character.
   if (file[0] == '/')
     ++file;
 
   ManifestService* manifest_service = GetManifestService();
   if (manifest_service == NULL ||
       !manifest_service->OpenResource(file, fd)) {
     return NACL_ABI_EIO;
   }
 
   return (*fd == -1) ? NACL_ABI_ENOENT : 0;
 }
 
 }  // namespace ppapi