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

Unified Diff: chrome/installer/setup/install_unittest.cc

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again 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/installer/setup/install.cc ('k') | chrome/installer/setup/install_worker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_unittest.cc
diff --git a/chrome/installer/setup/install_unittest.cc b/chrome/installer/setup/install_unittest.cc
index b3eccf634dcb705ebb4c162a97116d87166d2230..99337d01644131d114d6d0a50fbecdf17ea6b878 100644
--- a/chrome/installer/setup/install_unittest.cc
+++ b/chrome/installer/setup/install_unittest.cc
@@ -117,10 +117,10 @@ class InstallShortcutTest : public testing::Test {
new base::ScopedPathOverride(base::DIR_COMMON_START_MENU,
fake_common_start_menu_.path()));
- string16 shortcut_name(
+ base::string16 shortcut_name(
dist_->GetShortcutName(BrowserDistribution::SHORTCUT_CHROME) +
installer::kLnkExt);
- string16 alternate_shortcut_name(
+ base::string16 alternate_shortcut_name(
dist_->GetShortcutName(BrowserDistribution::SHORTCUT_CHROME_ALTERNATE) +
installer::kLnkExt);
@@ -426,7 +426,7 @@ TEST_F(InstallShortcutTest, CreateIfNoSystemLevelSomeSystemShortcutsExist) {
}
TEST(EscapeXmlAttributeValueTest, EscapeCrazyValue) {
- string16 val(L"This has 'crazy' \"chars\" && < and > signs.");
+ base::string16 val(L"This has 'crazy' \"chars\" && < and > signs.");
static const wchar_t kExpectedEscapedVal[] =
L"This has &apos;crazy&apos; \"chars\" &amp;&amp; &lt; and > signs.";
installer::EscapeXmlAttributeValueInSingleQuotes(&val);
@@ -434,7 +434,7 @@ TEST(EscapeXmlAttributeValueTest, EscapeCrazyValue) {
}
TEST(EscapeXmlAttributeValueTest, DontEscapeNormalValue) {
- string16 val(L"Google Chrome");
+ base::string16 val(L"Google Chrome");
static const wchar_t kExpectedEscapedVal[] = L"Google Chrome";
installer::EscapeXmlAttributeValueInSingleQuotes(&val);
ASSERT_STREQ(kExpectedEscapedVal, val.c_str());
« no previous file with comments | « chrome/installer/setup/install.cc ('k') | chrome/installer/setup/install_worker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698