Strip carriage return from find text; show newline symbols.

chrome/browser/ui/find_bar/find_tab_helper.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 "chrome/browser/ui/find_bar/find_tab_helper.h"
 
 #include <vector>
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 22 matching lines @@
       last_search_case_sensitive_(false),
       last_search_result_() {
 }
 
 FindTabHelper::~FindTabHelper() {
 }
 
 void FindTabHelper::StartFinding(base::string16 search_string,
                                  bool forward_direction,
                                  bool case_sensitive) {
+  const base::char16 kInvalidChars[] = { '\r', 0 };
+  base::RemoveChars(search_string, kInvalidChars, &search_string);

[Peter Kasting, 2014/07/09 00:27:05]

You can just pass L"\r" here directly, no need to declare a separate array.  (I
consider this not only shorter and more readable but safer, since that way it's
impossible to forget the trailing \0 or have someone come along and accidentally
remove it later.)

Add a comment about why we're doing this (namely, that text in the renderer
doesn't have carriage returns).  (Actually, is it possible for authors to
explicitly force CRs into their text somehow?  Or will Blink always strip them?)

[msw, 2014/07/09 00:40:12]

Done.
Done.
Both of these work with my CL, not sure what else to try:
data:text/html,hello<br>world
data:text/html,hello<p>world

[Peter Kasting, 2014/07/09 00:43:26]

I'm thinking of pages that actually contain, say, a <pre> block with CR and/or
CRLF characters in it.

Really a Blink person would be more of an authority here.

[msw, 2014/07/09 15:39:33]

The patch works well in my tests of the following (also omitting <pre>):
data:text/html,<pre>hello%0Aworld</pre>
data:text/html,<pre>hello%0Dworld</pre>
data:text/html,<pre>hello%0A%0Dworld</pre>
data:text/html,<pre>hello%0D%0Aworld</pre>

+CC fsamuel, jam, nasko for any other advice, per r243709.

+
   // If search_string is empty, it means FindNext was pressed with a keyboard
   // shortcut so unless we have something to search for we return early.
   if (search_string.empty() && find_text_.empty()) {
     Profile* profile =
         Profile::FromBrowserContext(web_contents()->GetBrowserContext());
     base::string16 last_search_prepopulate_text =
         FindBarStateFactory::GetLastPrepopulateText(profile);
 
     // Try the last thing we searched for on this tab, then the last thing
     // searched for on any tab.
@@ skipping 112 matching lines @@
     // found.
     last_search_result_ = FindNotificationDetails(
         request_id, number_of_matches, selection, active_match_ordinal,
         final_update);
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_FIND_RESULT_AVAILABLE,
         content::Source<WebContents>(web_contents()),
         content::Details<FindNotificationDetails>(&last_search_result_));
   }
 }