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 'crazy' \"chars\" && < 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()); |