Revert 269791 "Pepper: Fix crash on allocation failure."

trunk/src/components/nacl/renderer/ppb_nacl_private_impl.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 "components/nacl/renderer/ppb_nacl_private_impl.h"
 
 #include <numeric>
 #include <string>
 #include <vector>
 
@@ skipping 1096 matching lines @@
   base::PlatformFile file = GetReadonlyPnaclFD(filename);
   if (file == base::kInvalidPlatformFileValue) {
     load_manager->ReportLoadError(
         PP_NACL_ERROR_PNACL_RESOURCE_FETCH,
         "The Portable Native Client (pnacl) component is not "
         "installed. Please consult chrome://components for more "
         "information.");
     return PP_FALSE;
   }
 
-  base::PlatformFileInfo file_info;
-  if (!GetPlatformFileInfo(file, &file_info)) {
+  const int kBufferSize = 1 << 20;
+  scoped_ptr<char[]> buffer(new char[kBufferSize]);
+  if (base::ReadPlatformFile(file, 0, buffer.get(), kBufferSize) < 0) {
     load_manager->ReportLoadError(
         PP_NACL_ERROR_PNACL_RESOURCE_FETCH,
-        std::string("GetPNaClResourceInfo, GetFileInfo failed for: ") +
+        std::string("PnaclResources::ReadResourceInfo reading failed for: ") +
             filename);
     return PP_FALSE;
   }
 
-  if (file_info.size > 1 << 20) {
-    load_manager->ReportLoadError(
-        PP_NACL_ERROR_PNACL_RESOURCE_FETCH,
-        std::string("GetPNaClResourceInfo, file too large: ") + filename);
-    return PP_FALSE;
-  }
-
-  scoped_ptr<char[]> buffer(new char[file_info.size]);
-  if (buffer.get() == NULL) {
-    load_manager->ReportLoadError(
-        PP_NACL_ERROR_PNACL_RESOURCE_FETCH,
-        std::string("GetPNaClResourceInfo, couldn't allocate for: ") +
-            filename);
-    return PP_FALSE;
-  }
-
-  if (base::ReadPlatformFile(file, 0, buffer.get(), file_info.size) < 0) {
-    load_manager->ReportLoadError(
-        PP_NACL_ERROR_PNACL_RESOURCE_FETCH,
-        std::string("GetPNaClResourceInfo, reading failed for: ") + filename);
-    return PP_FALSE;
-  }
-
   // Expect the JSON file to contain a top-level object (dictionary).
   Json::Reader json_reader;
   Json::Value json_data;
   if (!json_reader.parse(buffer.get(), json_data)) {
     load_manager->ReportLoadError(
         PP_NACL_ERROR_PNACL_RESOURCE_FETCH,
         std::string("Parsing resource info failed: JSON parse error: ") +
             json_reader.getFormattedErrorMessages());
     return PP_FALSE;
   }
@@ skipping 142 matching lines @@
   &PostMessageToJavaScript
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl