Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm
index 5a60c8e0fe263e4e07aa30adf17669b208d2f6dd..12d2b1400614542778e4dd878d0ca4025c4e9d61 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm
@@ -38,7 +38,7 @@ TEST_F(ExtensionInstallViewControllerTest, BasicsNormalCancel) {
chrome::BuildExtensionInstallPrompt(extension_.get());
std::vector<base::string16> permissions;
- permissions.push_back(UTF8ToUTF16("warning 1"));
+ permissions.push_back(base::UTF8ToUTF16("warning 1"));
prompt.SetPermissions(permissions);
// No details provided with this permission.
std::vector<base::string16> details;
@@ -93,7 +93,7 @@ TEST_F(ExtensionInstallViewControllerTest, BasicsNormalOK) {
ExtensionInstallPrompt::Prompt prompt =
chrome::BuildExtensionInstallPrompt(extension_.get());
std::vector<base::string16> permissions;
- permissions.push_back(UTF8ToUTF16("warning 1"));
+ permissions.push_back(base::UTF8ToUTF16("warning 1"));
prompt.SetPermissions(permissions);
// No details provided with this permission.
std::vector<base::string16> details;
@@ -121,7 +121,7 @@ TEST_F(ExtensionInstallViewControllerTest, MultipleWarnings) {
ExtensionInstallPrompt::Prompt one_warning_prompt =
chrome::BuildExtensionInstallPrompt(extension_.get());
std::vector<base::string16> permissions;
- permissions.push_back(UTF8ToUTF16("warning 1"));
+ permissions.push_back(base::UTF8ToUTF16("warning 1"));
one_warning_prompt.SetPermissions(permissions);
// No details provided with this permission.
std::vector<base::string16> details;
@@ -130,7 +130,7 @@ TEST_F(ExtensionInstallViewControllerTest, MultipleWarnings) {
ExtensionInstallPrompt::Prompt two_warnings_prompt =
chrome::BuildExtensionInstallPrompt(extension_.get());
- permissions.push_back(UTF8ToUTF16("warning 2"));
+ permissions.push_back(base::UTF8ToUTF16("warning 2"));
two_warnings_prompt.SetPermissions(permissions);
// No details provided with this permission.
details.push_back(base::string16());
@@ -268,7 +268,7 @@ TEST_F(ExtensionInstallViewControllerTest, OAuthIssues) {
ExtensionInstallPrompt::Prompt prompt =
chrome::BuildExtensionInstallPrompt(extension_.get());
std::vector<base::string16> permissions;
- permissions.push_back(UTF8ToUTF16("warning 1"));
+ permissions.push_back(base::UTF8ToUTF16("warning 1"));
prompt.SetPermissions(permissions);
// No details provided with this permission.
std::vector<base::string16> details;
@@ -276,8 +276,8 @@ TEST_F(ExtensionInstallViewControllerTest, OAuthIssues) {
prompt.SetPermissionsDetails(details);
IssueAdviceInfoEntry issue;
- issue.description = UTF8ToUTF16("issue description 1");
- issue.details.push_back(UTF8ToUTF16("issue detail 1"));
+ issue.description = base::UTF8ToUTF16("issue description 1");
+ issue.details.push_back(base::UTF8ToUTF16("issue detail 1"));
IssueAdviceInfo issues;
issues.push_back(issue);
prompt.SetOAuthIssueAdvice(issues);
@@ -310,7 +310,7 @@ TEST_F(ExtensionInstallViewControllerTest, PostInstallPermissionsPrompt) {
ExtensionInstallPrompt::Prompt prompt =
chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get());
std::vector<base::string16> permissions;
- permissions.push_back(UTF8ToUTF16("warning 1"));
+ permissions.push_back(base::UTF8ToUTF16("warning 1"));
prompt.SetPermissions(permissions);
// No details provided with this permission.
std::vector<base::string16> details;
@@ -339,9 +339,9 @@ TEST_F(ExtensionInstallViewControllerTest, PermissionsDetails) {
chrome::BuildExtensionInstallPrompt(extension_.get());
std::vector<base::string16> permissions;
- permissions.push_back(UTF8ToUTF16("warning 1"));
+ permissions.push_back(base::UTF8ToUTF16("warning 1"));
std::vector<base::string16> permissions_details;
- permissions_details.push_back(UTF8ToUTF16("Detail 1"));
+ permissions_details.push_back(base::UTF8ToUTF16("Detail 1"));
prompt.SetPermissions(permissions);
prompt.SetPermissionsDetails(permissions_details);
prompt.SetIsShowingDetails(

Powered by Google App Engine
This is Rietveld 408576698