Remove nonsfi token workaround.

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 74 matching lines @@
   // NaClProcessMsg_ResolveFileTokenAsyncReply instead of using a
   // global inside components/nacl/loader/nacl_listener.cc
   base::AutoLock lock(open_resource_lock_);
 
   // OpenResource will return INVALID SerializedHandle, if it is not supported.
   // Specifically, PNaCl doesn't support open resource.
   ppapi::proxy::SerializedHandle ipc_fd;
 
   // File tokens are ignored here, but needed when the message is processed
   // inside NaClIPCAdapter.
-  uint64_t file_token_lo;
-  uint64_t file_token_hi;
+  uint64_t file_token_lo = 0;
+  uint64_t file_token_hi = 0;
   if (!filter_->Send(new PpapiHostMsg_OpenResource(
           std::string(kFilePrefix) + file,
           &ipc_fd,
           &file_token_lo,
           &file_token_hi))) {
     LOG(ERROR) << "ManifestService::OpenResource failed:" << file;
     *fd = -1;
     return false;
   }
 
-#if defined(OS_NACL_SFI)
   // File tokens are used internally by NaClIPCAdapter and should have
   // been cleared from the message when it is received here.
-  // Note that, on Non-SFI NaCl, the IPC channel is directly connected to the
-  // renderer process, so NaClIPCAdapter does not work. It means,
-  // file_token_{lo,hi} fields may be properly filled, although it is just
-  // ignored here.
+  // These tokens should never be set for Non-SFI mode.
   CHECK(file_token_lo == 0);
   CHECK(file_token_hi == 0);
-#endif
 
   // Copy the file if we received a valid file descriptor. Otherwise, if we got
   // a reply, the file doesn't exist, so provide an fd of -1.
   // See IrtOpenResource() for how this function's result is interpreted.
   if (ipc_fd.is_file())
     *fd = ipc_fd.descriptor().fd;
   else
     *fd = -1;
   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