Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/content/renderer/accessibility/blink_ax_tree_source.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 "content/renderer/accessibility/blink_ax_tree_source.h"
 
 #include <set>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 38 matching lines @@
 // accessibilityIsIgnored().
 bool IsParentUnignoredOf(WebAXObject ancestor,
                          WebAXObject child) {
   WebAXObject parent = child.parentObject();
   while (!parent.isDetached() && parent.accessibilityIsIgnored())
     parent = parent.parentObject();
   return parent.equals(ancestor);
 }
 
 bool IsTrue(std::string html_value) {
-  return base::LowerCaseEqualsASCII(html_value, "true");
+  return LowerCaseEqualsASCII(html_value, "true");
 }
 
 std::string GetEquivalentAriaRoleString(const ui::AXRole role) {
   switch (role) {
     case ui::AX_ROLE_ARTICLE:
       return "article";
     case ui::AX_ROLE_BANNER:
       return "banner";
     case ui::AX_ROLE_COMPLEMENTARY:
       return "complementary";
@@ skipping 219 matching lines @@
   bool is_iframe = false;
   std::string live_atomic;
   std::string live_busy;
   std::string live_status;
   std::string live_relevant;
 
   if (!node.isNull() && node.isElementNode()) {
     WebElement element = node.to<WebElement>();
     is_iframe = (element.tagName() == ASCIIToUTF16("IFRAME"));
 
-    if (base::LowerCaseEqualsASCII(
-            base::string16(element.getAttribute("aria-expanded")),
-            "true"))
+    if (LowerCaseEqualsASCII(element.getAttribute("aria-expanded"), "true"))
       dst->state |= (1 << ui::AX_STATE_EXPANDED);
 
     // TODO(ctguil): The tagName in WebKit is lower cased but
     // HTMLElement::nodeName calls localNameUpper. Consider adding
     // a WebElement method that returns the original lower cased tagName.
     dst->AddStringAttribute(
         ui::AX_ATTR_HTML_TAG,
         base::StringToLowerASCII(UTF16ToUTF8(element.tagName())));
     for (unsigned i = 0; i < element.attributeCount(); ++i) {
       std::string name = base::StringToLowerASCII(UTF16ToUTF8(
@@ skipping 244 matching lines @@
 blink::WebDocument BlinkAXTreeSource::GetMainDocument() const {
   WebView* view = render_frame_->render_view()->GetWebView();
   WebFrame* main_frame = view ? view->mainFrame() : NULL;
 
   if (main_frame)
     return main_frame->document();
   return WebDocument();
 }
 
 }  // namespace content