diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 03:37:06 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 03:37:06 +0000 |
| commit | f43d11d73b66b5ddd4da371259accce2d8341688 (patch) | |
| tree | 56d432ddd5b76494bff2482cbe6e0a645b14518e | |
| parent | db108ddfbd5a856ed095cbef788c8c4f4628e607 (diff) | |
| download | chromium_src-f43d11d73b66b5ddd4da371259accce2d8341688.zip chromium_src-f43d11d73b66b5ddd4da371259accce2d8341688.tar.gz chromium_src-f43d11d73b66b5ddd4da371259accce2d8341688.tar.bz2 | |
file_util: Get rid of the deprecated UpOneDirectory function.
This removes the latest usage of this function.
BUG=24672
TEST=mini_installer_test
Review URL: http://codereview.chromium.org/2946007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53434 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/file_util.cc | 8 | ||||
| -rw-r--r-- | base/file_util_deprecated.h | 3 | ||||
| -rw-r--r-- | chrome/test/mini_installer_test/chrome_mini_installer.cc | 4 | ||||
| -rw-r--r-- | chrome/test/mini_installer_test/mini_installer_test_util.cc | 17 | ||||
| -rw-r--r-- | chrome/test/mini_installer_test/mini_installer_test_util.h | 4 |
5 files changed, 13 insertions, 23 deletions
diff --git a/base/file_util.cc b/base/file_util.cc index b611716..1689d5b 100644 --- a/base/file_util.cc +++ b/base/file_util.cc @@ -394,14 +394,6 @@ FILE* OpenFile(const std::wstring& filename, const char* mode) { int ReadFile(const std::wstring& filename, char* data, int size) { return ReadFile(FilePath::FromWStringHack(filename), data, size); } -void UpOneDirectory(std::wstring* dir) { - FilePath path = FilePath::FromWStringHack(*dir); - FilePath directory = path.DirName(); - // If there is no separator, we will get back kCurrentDirectory. - // In this case don't change |dir|. - if (directory.value() != FilePath::kCurrentDirectory) - *dir = directory.ToWStringHack(); -} int WriteFile(const std::wstring& filename, const char* data, int size) { return WriteFile(FilePath::FromWStringHack(filename), data, size); } diff --git a/base/file_util_deprecated.h b/base/file_util_deprecated.h index efffe8f..d02ad85 100644 --- a/base/file_util_deprecated.h +++ b/base/file_util_deprecated.h @@ -26,9 +26,6 @@ namespace file_util { FILE* OpenFile(const std::string& filename, const char* mode); FILE* OpenFile(const std::wstring& filename, const char* mode); -// Use FilePath::DirName instead. -void UpOneDirectory(std::wstring* dir); - // Use FilePath::BaseName instead. std::wstring GetFilenameFromPath(const std::wstring& path); diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc index 5d54706..931fb52 100644 --- a/chrome/test/mini_installer_test/chrome_mini_installer.cc +++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc @@ -217,14 +217,14 @@ void ChromeMiniInstaller::Repair( DeletePvRegistryKey(); printf("Deleted registry. Now trying to launch chrome\n"); } - std::wstring current_path; + FilePath current_path; ASSERT_TRUE(MiniInstallerTestUtil::ChangeCurrentDirectory(¤t_path)); VerifyChromeLaunch(false); printf("\nInstalling Chrome again to see if it can be repaired\n\n"); InstallFullInstaller(true); printf("Chrome repair successful.\n"); // Set the current directory back to original path. - ::SetCurrentDirectory(current_path.c_str()); + file_util::SetCurrentDirectory(current_path); } // This method first checks if Chrome is running. diff --git a/chrome/test/mini_installer_test/mini_installer_test_util.cc b/chrome/test/mini_installer_test/mini_installer_test_util.cc index 5bba692..63c2f0b 100644 --- a/chrome/test/mini_installer_test/mini_installer_test_util.cc +++ b/chrome/test/mini_installer_test/mini_installer_test_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,15 +16,14 @@ // Change current directory so that chrome.dll from current folder // will not be used as fall back. -bool MiniInstallerTestUtil::ChangeCurrentDirectory(std::wstring *current_path) { - wchar_t backup_path[MAX_PATH]; - DWORD ret = ::GetCurrentDirectory(MAX_PATH, backup_path); - if (ret == 0 && ret > MAX_PATH) +bool MiniInstallerTestUtil::ChangeCurrentDirectory(FilePath* current_path) { + FilePath backup_path; + if (!file_util::GetCurrentDirectory(&backup_path)) return false; - current_path->assign(backup_path); - file_util::UpOneDirectory(current_path); - ::SetCurrentDirectory(current_path->c_str()); - current_path->assign(backup_path); + + if (!file_util::SetCurrentDirectory(backup_path.DirName())) + return false; + *current_path = backup_path; return true; } diff --git a/chrome/test/mini_installer_test/mini_installer_test_util.h b/chrome/test/mini_installer_test/mini_installer_test_util.h index 0153b10..f6aadf1 100644 --- a/chrome/test/mini_installer_test/mini_installer_test_util.h +++ b/chrome/test/mini_installer_test/mini_installer_test_util.h @@ -14,6 +14,8 @@ #include "base/basictypes.h" +class FilePath; + // This structure holds the name and creation time // details of all the chrome nightly builds. class FileInfo { @@ -38,7 +40,7 @@ class MiniInstallerTestUtil { public: // This method will change the current directory to one level up and // return the new current path. - static bool ChangeCurrentDirectory(std::wstring *current_path); + static bool ChangeCurrentDirectory(FilePath* current_path); // Closes specified process. static void CloseProcesses(const std::wstring& executable_name); |