NaCl: Fix NaClBrowserTestPnaclNonSfi.IrtManifestFile

chrome/test/data/nacl/manifest_file/pm_manifest_file_test.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.
  */
 
 //
 // Post-message based test for simple rpc based access to name services.
 //
 
@@ skipping 410 matching lines @@
     NaClSrpcDtor(&manifest_channel);
     return;
   }
 
   sb->DiscardOutput();
   sb->Printf("File Contents:\n");
 
   char buffer[4096];
   int len;
   while ((len = read(desc, buffer, sizeof buffer - 1)) > 0) {
-    // NB: fgets does not discard the newline nor any carriage return
-    // character before that.
-    //
-    // Note that CR LF is the default end-of-line style for Windows.
-    // Furthermore, when the test_file (input data, which happens to
-    // be the nmf file) is initially created in a change list, the
-    // patch is sent to our try bots as text.  This means that when
-    // the file arrives, it has CR LF endings instead of the original
-    // LF line endings.  Since the expected or golden data is
-    // (manually) encoded in the HTML file's JavaScript, there will be
-    // a mismatch.  After submission, the svn property svn:eol-style
-    // will be set to LF, so a clean check out should have LF and not
-    // CR LF endings, and the tests will pass without CR removal.
-    // However -- and there's always a however in long discourses --
-    // if the nmf file is edited, say, because the test is being
-    // modified, and the modification is being done on a Windows
-    // machine, then it is likely that the editor used by the
-    // programmer will convert the file to CR LF endings.  Which,
-    // unfortunatly, implies that the test will mysteriously fail
-    // again.
-    //
-    // To defend against such nonsense, we weaken the test slighty,
-    // and just strip the CR if it is present.
-    if (len >= 2 && buffer[len-1] == '\n' && buffer[len-2] == '\r') {
-      buffer[len-2] = '\n';
-      buffer[len-1] = '\0';
-    }
     // Null terminate.
-    buffer[len] = 0;
+    buffer[len] = '\0';
     sb->Printf("%s", buffer);
   }
   NaClSrpcDtor(&manifest_channel);
   return;
 }
 
 // HandleMessage gets invoked when postMessage is called on the DOM
 // element associated with this plugin instance.  In this case, if we
 // are given a string, we'll post a message back to JavaScript with a
 // reply -- essentially treating this as a string-based RPC.
@@ skipping 65 matching lines @@
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   fprintf(stderr, "CreateModule invoked\n"); fflush(NULL);
   return new MyModule();
 }
 
 }  // namespace pp