| Index: content/browser/accessibility/browser_accessibility.cc
|
| diff --git a/content/browser/accessibility/browser_accessibility.cc b/content/browser/accessibility/browser_accessibility.cc
|
| index 45f22017718326531d3634c16f522e14f9ed9231..223cd8df559084e41f6938e981f6b31cdab050bc 100644
|
| --- a/content/browser/accessibility/browser_accessibility.cc
|
| +++ b/content/browser/accessibility/browser_accessibility.cc
|
| @@ -444,17 +444,17 @@ bool BrowserAccessibility::GetStringAttribute(
|
| return false;
|
| }
|
|
|
| -string16 BrowserAccessibility::GetString16Attribute(
|
| +base::string16 BrowserAccessibility::GetString16Attribute(
|
| StringAttribute attribute) const {
|
| std::string value_utf8;
|
| if (!GetStringAttribute(attribute, &value_utf8))
|
| - return string16();
|
| + return base::string16();
|
| return UTF8ToUTF16(value_utf8);
|
| }
|
|
|
| bool BrowserAccessibility::GetString16Attribute(
|
| StringAttribute attribute,
|
| - string16* value) const {
|
| + base::string16* value) const {
|
| std::string value_utf8;
|
| if (!GetStringAttribute(attribute, &value_utf8))
|
| return false;
|
| @@ -522,7 +522,7 @@ bool BrowserAccessibility::GetHtmlAttribute(
|
| }
|
|
|
| bool BrowserAccessibility::GetHtmlAttribute(
|
| - const char* html_attr, string16* value) const {
|
| + const char* html_attr, base::string16* value) const {
|
| std::string value_utf8;
|
| if (!GetHtmlAttribute(html_attr, &value_utf8))
|
| return false;
|
| @@ -537,7 +537,7 @@ bool BrowserAccessibility::GetAriaTristate(
|
| *is_defined = false;
|
| *is_mixed = false;
|
|
|
| - string16 value;
|
| + base::string16 value;
|
| if (!GetHtmlAttribute(html_attr, &value) ||
|
| value.empty() ||
|
| EqualsASCII(value, "undefined")) {
|
|
|