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

Unified Diff: chrome_frame/test_utils.cc

Issue 113143006: Add base:: to string16 in chrome_frame/. (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
« no previous file with comments | « chrome_frame/test_utils.h ('k') | chrome_frame/turndown_prompt/turndown_prompt.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test_utils.cc
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index b8884e7aea9e97611ff571ce24bf3f7a378dc473..4661bf83cc3e930d4d1c39f0f8de1fd09ddc7926 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -71,7 +71,7 @@ void ScopedChromeFrameRegistrar::RegisterDefaults() {
// information.
// static
void ScopedChromeFrameRegistrar::DoRegistration(
- const string16& path,
+ const base::string16& path,
RegistrationType registration_type,
RegistrationOperation registration_operation) {
static const char* const kEntrypoints[] = {
@@ -95,7 +95,7 @@ void ScopedChromeFrameRegistrar::DoRegistration(
entrypoint_index += 2;
if (registration_operation == UNREGISTER)
entrypoint_index += 1;
- string16 registration_command(ASCIIToUTF16("\""));
+ base::string16 registration_command(ASCIIToUTF16("\""));
registration_command +=
CommandLine::ForCurrentProcess()->GetProgram().value();
registration_command += ASCIIToUTF16("\" ");
« no previous file with comments | « chrome_frame/test_utils.h ('k') | chrome_frame/turndown_prompt/turndown_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698