Update uses of UTF conversions in content/ to use the base:: namespace.

content/renderer/accessibility/accessibility_node_serializer.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 "content/renderer/accessibility/accessibility_node_serializer.h"
 
 #include <set>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 115 matching lines @@
 
 }  // Anonymous namespace
 
 void SerializeAccessibilityNode(
     const WebAXObject& src,
     AccessibilityNodeData* dst) {
   dst->role = src.role();
   dst->state = ConvertState(src);
   dst->location = src.boundingBoxRect();
   dst->id = src.axID();
-  std::string name = UTF16ToUTF8(src.title());
+  std::string name = base::UTF16ToUTF8(src.title());
 
   std::string value;
   if (src.valueDescription().length()) {
     dst->AddStringAttribute(dst->ATTR_VALUE,
-                            UTF16ToUTF8(src.valueDescription()));
+                            base::UTF16ToUTF8(src.valueDescription()));
   } else {
-    dst->AddStringAttribute(dst->ATTR_VALUE, UTF16ToUTF8(src.stringValue()));
+    dst->AddStringAttribute(dst->ATTR_VALUE,
+                            base::UTF16ToUTF8(src.stringValue()));
   }
 
   if (dst->role == blink::WebAXRoleColorWell) {
     int r, g, b;
     src.colorValue(r, g, b);
     dst->AddIntAttribute(dst->ATTR_COLOR_VALUE_RED, r);
     dst->AddIntAttribute(dst->ATTR_COLOR_VALUE_GREEN, g);
     dst->AddIntAttribute(dst->ATTR_COLOR_VALUE_BLUE, b);
   }
 
@@ skipping 16 matching lines @@
     word_starts.reserve(src_word_starts.size());
     word_ends.reserve(src_word_starts.size());
     for (size_t i = 0; i < src_word_starts.size(); ++i) {
       word_starts.push_back(src_word_starts[i]);
       word_ends.push_back(src_word_ends[i]);
     }
     dst->AddIntListAttribute(dst->ATTR_WORD_STARTS, word_starts);
     dst->AddIntListAttribute(dst->ATTR_WORD_ENDS, word_ends);
   }
 
-  if (src.accessKey().length())
-    dst->AddStringAttribute(dst->ATTR_ACCESS_KEY, UTF16ToUTF8(src.accessKey()));
-  if (src.actionVerb().length())
-    dst->AddStringAttribute(dst->ATTR_ACTION, UTF16ToUTF8(src.actionVerb()));
+  if (src.accessKey().length()) {
+    dst->AddStringAttribute(dst->ATTR_ACCESS_KEY,
+                            base::UTF16ToUTF8(src.accessKey()));
+  }
+  if (src.actionVerb().length()) {
+    dst->AddStringAttribute(dst->ATTR_ACTION,
+                            base::UTF16ToUTF8(src.actionVerb()));
+  }
   if (src.isAriaReadOnly())
     dst->AddBoolAttribute(dst->ATTR_ARIA_READONLY, true);
   if (src.isButtonStateMixed())
     dst->AddBoolAttribute(dst->ATTR_BUTTON_MIXED, true);
   if (src.canSetValueAttribute())
     dst->AddBoolAttribute(dst->ATTR_CAN_SET_VALUE, true);
   if (src.accessibilityDescription().length()) {
     dst->AddStringAttribute(dst->ATTR_DESCRIPTION,
-                            UTF16ToUTF8(src.accessibilityDescription()));
+                            base::UTF16ToUTF8(src.accessibilityDescription()));
   }
   if (src.hasComputedStyle()) {
     dst->AddStringAttribute(dst->ATTR_DISPLAY,
-                            UTF16ToUTF8(src.computedStyleDisplay()));
+                            base::UTF16ToUTF8(src.computedStyleDisplay()));
   }
   if (src.helpText().length())
-    dst->AddStringAttribute(dst->ATTR_HELP, UTF16ToUTF8(src.helpText()));
+    dst->AddStringAttribute(dst->ATTR_HELP, base::UTF16ToUTF8(src.helpText()));
   if (src.keyboardShortcut().length()) {
     dst->AddStringAttribute(dst->ATTR_SHORTCUT,
-                            UTF16ToUTF8(src.keyboardShortcut()));
+                            base::UTF16ToUTF8(src.keyboardShortcut()));
   }
   if (!src.titleUIElement().isDetached()) {
     dst->AddIntAttribute(dst->ATTR_TITLE_UI_ELEMENT,
                          src.titleUIElement().axID());
   }
   if (!src.url().isEmpty())
     dst->AddStringAttribute(dst->ATTR_URL, src.url().spec());
 
   if (dst->role == blink::WebAXRoleHeading)
     dst->AddIntAttribute(dst->ATTR_HIERARCHICAL_LEVEL, src.headingLevel());
@@ skipping 14 matching lines @@
 
   WebNode node = src.node();
   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"));
+    is_iframe = (element.tagName() == base::ASCIIToUTF16("IFRAME"));
 
     if (LowerCaseEqualsASCII(element.getAttribute("aria-expanded"), "true"))
       dst->state |= (1 << blink::WebAXStateExpanded);
 
     // 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(
         dst->ATTR_HTML_TAG,
-        StringToLowerASCII(UTF16ToUTF8(element.tagName())));
+        StringToLowerASCII(base::UTF16ToUTF8(element.tagName())));
     for (unsigned i = 0; i < element.attributeCount(); ++i) {
-      std::string name = StringToLowerASCII(UTF16ToUTF8(
+      std::string name = StringToLowerASCII(base::UTF16ToUTF8(
           element.attributeLocalName(i)));
-      std::string value = UTF16ToUTF8(element.attributeValue(i));
+      std::string value = base::UTF16ToUTF8(element.attributeValue(i));
       dst->html_attributes.push_back(std::make_pair(name, value));
     }
 
     if (dst->role == blink::WebAXRoleEditableText ||
         dst->role == blink::WebAXRoleTextArea ||
         dst->role == blink::WebAXRoleTextField) {
       dst->AddIntAttribute(dst->ATTR_TEXT_SEL_START, src.selectionStart());
       dst->AddIntAttribute(dst->ATTR_TEXT_SEL_END, src.selectionEnd());
 
       WebVector<int> src_line_breaks;
       src.lineBreaks(src_line_breaks);
       if (src_line_breaks.size() > 0) {
         std::vector<int32> line_breaks;
         line_breaks.reserve(src_line_breaks.size());
         for (size_t i = 0; i < src_line_breaks.size(); ++i)
           line_breaks.push_back(src_line_breaks[i]);
         dst->AddIntListAttribute(dst->ATTR_LINE_BREAKS, line_breaks);
       }
     }
 
     // ARIA role.
     if (element.hasAttribute("role")) {
       dst->AddStringAttribute(dst->ATTR_ROLE,
-                              UTF16ToUTF8(element.getAttribute("role")));
+                              base::UTF16ToUTF8(element.getAttribute("role")));
     }
 
     // Live region attributes
-    live_atomic = UTF16ToUTF8(element.getAttribute("aria-atomic"));
-    live_busy = UTF16ToUTF8(element.getAttribute("aria-busy"));
-    live_status = UTF16ToUTF8(element.getAttribute("aria-live"));
-    live_relevant = UTF16ToUTF8(element.getAttribute("aria-relevant"));
+    live_atomic = base::UTF16ToUTF8(element.getAttribute("aria-atomic"));
+    live_busy = base::UTF16ToUTF8(element.getAttribute("aria-busy"));
+    live_status = base::UTF16ToUTF8(element.getAttribute("aria-live"));
+    live_relevant = base::UTF16ToUTF8(element.getAttribute("aria-relevant"));
   }
 
   // Walk up the parent chain to set live region attributes of containers
   std::string container_live_atomic;
   std::string container_live_busy;
   std::string container_live_status;
   std::string container_live_relevant;
   WebAXObject container_accessible = src;
   while (!container_accessible.isDetached()) {
     WebNode container_node = container_accessible.node();
     if (!container_node.isNull() && container_node.isElementNode()) {
       WebElement container_elem = container_node.to<WebElement>();
       if (container_elem.hasAttribute("aria-atomic") &&
           container_live_atomic.empty()) {
         container_live_atomic =
-            UTF16ToUTF8(container_elem.getAttribute("aria-atomic"));
+            base::UTF16ToUTF8(container_elem.getAttribute("aria-atomic"));
       }
       if (container_elem.hasAttribute("aria-busy") &&
           container_live_busy.empty()) {
         container_live_busy =
-            UTF16ToUTF8(container_elem.getAttribute("aria-busy"));
+            base::UTF16ToUTF8(container_elem.getAttribute("aria-busy"));
       }
       if (container_elem.hasAttribute("aria-live") &&
           container_live_status.empty()) {
         container_live_status =
-            UTF16ToUTF8(container_elem.getAttribute("aria-live"));
+            base::UTF16ToUTF8(container_elem.getAttribute("aria-live"));
       }
       if (container_elem.hasAttribute("aria-relevant") &&
           container_live_relevant.empty()) {
         container_live_relevant =
-            UTF16ToUTF8(container_elem.getAttribute("aria-relevant"));
+            base::UTF16ToUTF8(container_elem.getAttribute("aria-relevant"));
       }
     }
     container_accessible = container_accessible.parentObject();
   }
 
   if (!live_atomic.empty())
     dst->AddBoolAttribute(dst->ATTR_LIVE_ATOMIC, IsTrue(live_atomic));
   if (!live_busy.empty())
     dst->AddBoolAttribute(dst->ATTR_LIVE_BUSY, IsTrue(live_busy));
   if (!live_status.empty())
@@ skipping 27 matching lines @@
                            src.maxValueForRange());
     dst->AddFloatAttribute(dst->ATTR_MIN_VALUE_FOR_RANGE,
                            src.minValueForRange());
   }
 
   if (dst->role == blink::WebAXRoleDocument ||
       dst->role == blink::WebAXRoleWebArea) {
     dst->AddStringAttribute(dst->ATTR_HTML_TAG, "#document");
     const WebDocument& document = src.document();
     if (name.empty())
-      name = UTF16ToUTF8(document.title());
-    dst->AddStringAttribute(dst->ATTR_DOC_TITLE, UTF16ToUTF8(document.title()));
+      name = base::UTF16ToUTF8(document.title());
+    dst->AddStringAttribute(dst->ATTR_DOC_TITLE,
+                            base::UTF16ToUTF8(document.title()));
     dst->AddStringAttribute(dst->ATTR_DOC_URL, document.url().spec());
     dst->AddStringAttribute(
         dst->ATTR_DOC_MIMETYPE,
         document.isXHTMLDocument() ? "text/xhtml" : "text/html");
     dst->AddBoolAttribute(dst->ATTR_DOC_LOADED, src.isLoaded());
     dst->AddFloatAttribute(dst->ATTR_DOC_LOADING_PROGRESS,
                            src.estimatedLoadingProgress());
 
     const WebDocumentType& doctype = document.doctype();
     if (!doctype.isNull()) {
       dst->AddStringAttribute(dst->ATTR_DOC_DOCTYPE,
-                              UTF16ToUTF8(doctype.name()));
+                              base::UTF16ToUTF8(doctype.name()));
     }
 
     const gfx::Size& scroll_offset = document.frame()->scrollOffset();
     dst->AddIntAttribute(dst->ATTR_SCROLL_X, scroll_offset.width());
     dst->AddIntAttribute(dst->ATTR_SCROLL_Y, scroll_offset.height());
 
     const gfx::Size& min_offset = document.frame()->minimumScrollOffset();
     dst->AddIntAttribute(dst->ATTR_SCROLL_X_MIN, min_offset.width());
     dst->AddIntAttribute(dst->ATTR_SCROLL_Y_MIN, min_offset.height());
 
@@ skipping 86 matching lines @@
   // TODO(ctguil): We may want to remove this check as webkit stabilizes.
   if (child.isDetached())
     return false;
 
   // Skip children whose parent isn't this - see indirect_child_ids, above.
   // As an exception, include children of an iframe element.
   bool is_iframe = false;
   WebNode node = parent.node();
   if (!node.isNull() && node.isElementNode()) {
     WebElement element = node.to<WebElement>();
-    is_iframe = (element.tagName() == ASCIIToUTF16("IFRAME"));
+    is_iframe = (element.tagName() == base::ASCIIToUTF16("IFRAME"));
   }
 
   return (is_iframe || IsParentUnignoredOf(parent, child));
 }
 
 }  // namespace content