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) {
+  // Remove the carriage return character, which generally isn't in web content.
+  const base::char16 kInvalidChars[] = { '\r', 0 };
+  base::RemoveChars(search_string, kInvalidChars, &search_string);
+
   // 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_));
   }
 }