summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-06-11 18:57:57 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-12 01:59:01 +0000
commit44ce0ec5b05184c4e33d597d4e5a32d9f38b15c2 (patch)
tree30eccdbbe72fb47810535fe56e0a8313be2db4b2 /chrome/installer/util
parent57ca2cd795596162f06a6aa67367d8ce0d9ded52 (diff)
downloadchromium_src-44ce0ec5b05184c4e33d597d4e5a32d9f38b15c2.zip
chromium_src-44ce0ec5b05184c4e33d597d4e5a32d9f38b15c2.tar.gz
chromium_src-44ce0ec5b05184c4e33d597d4e5a32d9f38b15c2.tar.bz2
Move StartsWith[ASCII] to base namespace.
NOPRESUBMIT=true (no presubmit due to removing base:: from a ScopedAllowIO) Review URL: https://codereview.chromium.org/1172183002 Cr-Commit-Position: refs/heads/master@{#334108}
Diffstat (limited to 'chrome/installer/util')
-rw-r--r--chrome/installer/util/delete_after_reboot_helper.cc5
-rw-r--r--chrome/installer/util/install_util.cc2
-rw-r--r--chrome/installer/util/shell_util_unittest.cc4
3 files changed, 6 insertions, 5 deletions
diff --git a/chrome/installer/util/delete_after_reboot_helper.cc b/chrome/installer/util/delete_after_reboot_helper.cc
index b298d6a..513cd3c 100644
--- a/chrome/installer/util/delete_after_reboot_helper.cc
+++ b/chrome/installer/util/delete_after_reboot_helper.cc
@@ -330,7 +330,7 @@ bool MatchPendingDeletePath(const base::FilePath& short_form_needle,
// First chomp the prefix since that will mess up GetShortPathName.
std::wstring prefix(L"\\??\\");
- if (StartsWith(match_path, prefix, false))
+ if (base::StartsWith(match_path, prefix, false))
match_path = match_path.substr(4);
// Get the short path name of the entry.
@@ -338,7 +338,8 @@ bool MatchPendingDeletePath(const base::FilePath& short_form_needle,
// Now compare the paths. If it isn't one we're looking for, add it
// to the list to keep.
- return StartsWith(short_match_path.value(), short_form_needle.value(), false);
+ return base::StartsWith(short_match_path.value(), short_form_needle.value(),
+ false);
}
// Removes all pending moves for the given |directory| and any contained
diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
index a3861b8..f7dccea 100644
--- a/chrome/installer/util/install_util.cc
+++ b/chrome/installer/util/install_util.cc
@@ -379,7 +379,7 @@ bool InstallUtil::IsPerUserInstall(const base::FilePath& exe_path) {
NOTREACHED();
return true;
}
- return !StartsWith(exe_path.value(), program_files_path.value(), false);
+ return !base::StartsWith(exe_path.value(), program_files_path.value(), false);
}
bool InstallUtil::IsMultiInstall(BrowserDistribution* dist,
diff --git a/chrome/installer/util/shell_util_unittest.cc b/chrome/installer/util/shell_util_unittest.cc
index 0294c43..68fc57d 100644
--- a/chrome/installer/util/shell_util_unittest.cc
+++ b/chrome/installer/util/shell_util_unittest.cc
@@ -979,7 +979,7 @@ TEST(ShellUtilTest, BuildAppModelIdLongEverything) {
TEST(ShellUtilTest, GetUserSpecificRegistrySuffix) {
base::string16 suffix;
ASSERT_TRUE(ShellUtil::GetUserSpecificRegistrySuffix(&suffix));
- ASSERT_TRUE(StartsWith(suffix, L".", true));
+ ASSERT_TRUE(base::StartsWith(suffix, L".", true));
ASSERT_EQ(27, suffix.length());
ASSERT_TRUE(base::ContainsOnlyChars(suffix.substr(1),
L"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"));
@@ -988,7 +988,7 @@ TEST(ShellUtilTest, GetUserSpecificRegistrySuffix) {
TEST(ShellUtilTest, GetOldUserSpecificRegistrySuffix) {
base::string16 suffix;
ASSERT_TRUE(ShellUtil::GetOldUserSpecificRegistrySuffix(&suffix));
- ASSERT_TRUE(StartsWith(suffix, L".", true));
+ ASSERT_TRUE(base::StartsWith(suffix, L".", true));
wchar_t user_name[256];
DWORD size = arraysize(user_name);