diff options
| author | Brett Wilson <brettw@chromium.org> | 2015-07-07 16:38:09 -0700 |
|---|---|---|
| committer | Brett Wilson <brettw@chromium.org> | 2015-07-07 23:39:16 +0000 |
| commit | e3c4d1a1228e00b190ad743a83f88a2266f45238 (patch) | |
| tree | 3923b42b43c9b7a8a689d0468688b30bf9ea8f83 /chrome/installer/util | |
| parent | 1c33a26e56880fbf058fd796aa004e097e07b691 (diff) | |
| download | chromium_src-e3c4d1a1228e00b190ad743a83f88a2266f45238.zip chromium_src-e3c4d1a1228e00b190ad743a83f88a2266f45238.tar.gz chromium_src-e3c4d1a1228e00b190ad743a83f88a2266f45238.tar.bz2 | |
Move WriteInto to base namespace.
Update all callers.
De-inlines the template. For some reason touching the namespaces started givin errors about DCHECK not being defined. Indeed, this header does not include logging.h. Rather than include logging in this very common header, it seems preferable to move the implementation to the .cc file.
This removes support for the wstring variant and updates the callers that used it.
R=ben@chromium.org, ben
TBR=jschuh (sandbox_win.cc)
NOPRESUBMIT=true
(this patch touches code using legacy wstrings)
Review URL: https://codereview.chromium.org/1223983002.
Cr-Commit-Position: refs/heads/master@{#337703}
Diffstat (limited to 'chrome/installer/util')
| -rw-r--r-- | chrome/installer/util/delete_after_reboot_helper.cc | 2 | ||||
| -rw-r--r-- | chrome/installer/util/install_util_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/installer/util/delete_after_reboot_helper.cc b/chrome/installer/util/delete_after_reboot_helper.cc index b9aeb43..bc7cd2b 100644 --- a/chrome/installer/util/delete_after_reboot_helper.cc +++ b/chrome/installer/util/delete_after_reboot_helper.cc @@ -248,7 +248,7 @@ void StringArrayToMultiSZBytes(const std::vector<PendingMove>& strings, base::FilePath GetShortPathName(const base::FilePath& path) { std::wstring short_path; DWORD length = GetShortPathName(path.value().c_str(), - WriteInto(&short_path, MAX_PATH), + base::WriteInto(&short_path, MAX_PATH), MAX_PATH); DWORD last_error = ::GetLastError(); DLOG_IF(WARNING, length == 0 && last_error != ERROR_PATH_NOT_FOUND) diff --git a/chrome/installer/util/install_util_unittest.cc b/chrome/installer/util/install_util_unittest.cc index a891f8d..92f9b75 100644 --- a/chrome/installer/util/install_util_unittest.cc +++ b/chrome/installer/util/install_util_unittest.cc @@ -447,7 +447,7 @@ TEST_F(InstallUtilTest, ProgramCompare) { // Test where strings don't match, but the same file is indicated. std::wstring short_expect; DWORD short_len = GetShortPathName(expect.value().c_str(), - WriteInto(&short_expect, MAX_PATH), + base::WriteInto(&short_expect, MAX_PATH), MAX_PATH); ASSERT_NE(static_cast<DWORD>(0), short_len); ASSERT_GT(static_cast<DWORD>(MAX_PATH), short_len); |