Revert of Remove some legacy versions of StartsWith and EndsWith.

content/browser/accessibility/android_granularity_movement_browsertest.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.
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
@@ skipping 73 matching lines @@
         static_cast<BrowserAccessibilityManagerAndroid*>(node->manager());
     base::string16 text = android_node->GetText();
     base::string16 concatenated;
     int previous_end_index = -1;
     while (manager->NextAtGranularity(
                granularity, end_index, android_node,
                &start_index, &end_index)) {
       int len = (granularity == GRANULARITY_CHARACTER) ?
           1 : end_index - start_index;
       base::string16 selection = text.substr(start_index, len);
-      if (base::EndsWith(selection, base::ASCIIToUTF16("\n"),
-                         base::CompareCase::INSENSITIVE_ASCII))
+      if (base::EndsWith(selection, base::ASCIIToUTF16("\n"), false))
         selection.erase(selection.size() - 1);
       if (!selection.empty()) {
         if (!concatenated.empty())
           concatenated += base::ASCIIToUTF16(", ");
         concatenated += base::ASCIIToUTF16("'") + selection +
             base::ASCIIToUTF16("'");
       }
 
       // Prevent an endless loop.
       if (end_index == previous_end_index) {
         LOG(ERROR) << "Bailing from loop, NextAtGranularity didn't advance";
         break;
       }
       previous_end_index = end_index;
     }
 
     base::string16 reverse;
     previous_end_index = -1;
     start_index = end_index;
     while (manager->PreviousAtGranularity(
         granularity, start_index, android_node, &start_index, &end_index)) {
       int len = (granularity == GRANULARITY_CHARACTER) ?
           1 : end_index - start_index;
       base::string16 selection = text.substr(start_index, len);
-      if (base::EndsWith(selection, base::ASCIIToUTF16("\n"),
-                         base::CompareCase::INSENSITIVE_ASCII))
+      if (base::EndsWith(selection, base::ASCIIToUTF16("\n"), false))
         selection = selection.substr(0, selection.size() - 1);
       if (!reverse.empty())
         reverse = base::ASCIIToUTF16(", ") + reverse;
       reverse = base::ASCIIToUTF16("'") + selection +
           base::ASCIIToUTF16("'") + reverse;
 
       // Prevent an endless loop.
       if (end_index == previous_end_index) {
         LOG(ERROR) << "Bailing from loop, PreviousAtGranularity didn't advance";
         break;
@@ skipping 70 matching lines @@
   BrowserAccessibility* root = LoadUrlAndGetAccessibilityRoot(url);
   ASSERT_EQ(1U, root->PlatformChildCount());
   BrowserAccessibility* pre = root->PlatformGetChild(0);
   ASSERT_EQ(0U, pre->PlatformChildCount());
 
   ASSERT_EQ(base::ASCIIToUTF16("'One,', 'two,', 'three!'"),
             TraverseNodeAtGranularity(pre, GRANULARITY_LINE));
 }
 
 }  // namespace content