Don't return Windows newlines through the PDF GetSelectedText JS API

pdf/instance.cc

 // Copyright (c) 2012 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 "pdf/instance.h"
 
 #include <algorithm>  // for min()
 #define _USE_MATH_DEFINES  // for M_PI
 #include <cmath>      // for log() and pow()
 #include <math.h>
@@ skipping 665 matching lines @@
 }
 
 pp::Var Instance::GetLinkAtPosition(const pp::Point& point) {
   pp::Point offset_point(point);
   ScalePoint(device_scale_, &offset_point);
   offset_point.set_x(offset_point.x() - available_area_.x());
   return engine_->GetLinkAtPosition(offset_point);
 }
 
 pp::Var Instance::GetSelectedText(bool html) {
-  if (html || !engine_->HasPermission(PDFEngine::PERMISSION_COPY))
+  if (html)
     return pp::Var();
   return engine_->GetSelectedText();
 }
 
 void Instance::InvalidateWidget(pp::Widget_Dev widget,
                                 const pp::Rect& dirty_rect) {
   if (v_scrollbar_.get() && *v_scrollbar_ == widget) {
     if (!image_data_.is_null())
       v_scrollbar_->Paint(dirty_rect.pp_rect(), &image_data_);
   } else if (h_scrollbar_.get() && *h_scrollbar_ == widget) {
@@ skipping 1153 matching lines @@
   }
   if (method_str == kJSGetHorizontalScrollbarThickness) {
     return pp::Var(
           h_scrollbar_.get() ? GetScrollbarReservedThickness() : 0);
   }
   if (method_str == kJSGetVerticalScrollbarThickness) {
     return pp::Var(
           v_scrollbar_.get() ? GetScrollbarReservedThickness() : 0);
   }
   if (method_str == kJSGetSelectedText) {
-    return GetSelectedText(false);
+    std::string selected_text = engine_->GetSelectedText();
+    // Always return unix newlines to JS.
+    base::ReplaceChars(selected_text, "\r", std::string(), &selected_text);
+    return selected_text;
   }
   if (method_str == kJSDocumentLoadComplete) {
     return pp::Var((document_load_state_ != LOAD_STATE_LOADING));
   }
   if (method_str == kJSPageYOffset) {
     return pp::Var(static_cast<int32_t>(
         v_scrollbar_.get() ? v_scrollbar_->GetValue() : 0));
   }
   if (method_str == kJSSetPageYOffset) {
     if (args.size() == 1 && args[0].is_number() && v_scrollbar_.get())
@@ skipping 938 matching lines @@
   return instance_->HasScriptableMethod(name, exception);
 }
 
 pp::Var PDFScriptableObject::Call(const pp::Var& method,
                                   const std::vector<pp::Var>& args,
                                   pp::Var* exception) {
   return instance_->CallScriptableMethod(method, args, exception);
 }
 
 }  // namespace chrome_pdf