Index: chrome/browser/background/background_application_list_model.cc |
diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc |
index 3edf3427e10de7c7b2b846f81414e04c724ec5cb..02eee9ecd983cca8b6e19561cc8e843ec2669f99 100644 |
--- a/chrome/browser/background/background_application_list_model.cc |
+++ b/chrome/browser/background/background_application_list_model.cc |
@@ -61,7 +61,7 @@ bool ExtensionNameComparator::operator()( |
const scoped_refptr<const Extension>& x, |
const scoped_refptr<const Extension>& y) { |
return l10n_util::StringComparator<base::string16>(collator_)( |
- UTF8ToUTF16(x->name()), UTF8ToUTF16(y->name())); |
+ base::UTF8ToUTF16(x->name()), base::UTF8ToUTF16(y->name())); |
} |
// Background application representation, private to the |
@@ -317,7 +317,7 @@ bool BackgroundApplicationListModel::IsBackgroundApp( |
BackgroundContentsService* service = |
BackgroundContentsServiceFactory::GetForProfile(profile); |
- base::string16 app_id = ASCIIToUTF16(extension.id()); |
+ base::string16 app_id = base::ASCIIToUTF16(extension.id()); |
// If we have an active or registered background contents for this app, then |
// it's a background app. This covers the cases where the app has created its |
// background contents, but it hasn't navigated yet, or the background |