summaryrefslogtreecommitdiffstats
path: root/cloud_print/virtual_driver/win
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-15 20:18:09 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-15 20:18:09 +0000
commitdcd16611096dcc5e7651763ff888135e0fb305fc (patch)
treefe1f69c236a92bd701bad04a6ccc1d30c08c6217 /cloud_print/virtual_driver/win
parent6dd1c54f48283e9c61b097b59feecf8d221e123b (diff)
downloadchromium_src-dcd16611096dcc5e7651763ff888135e0fb305fc.zip
chromium_src-dcd16611096dcc5e7651763ff888135e0fb305fc.tar.gz
chromium_src-dcd16611096dcc5e7651763ff888135e0fb305fc.tar.bz2
Move PathIsWritable, DirectoryExists, ContentsEqual, and TextContentsEqual to the base namespace.
TBR=sky Review URL: https://codereview.chromium.org/19052005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cloud_print/virtual_driver/win')
-rw-r--r--cloud_print/virtual_driver/win/install/setup.cc8
-rw-r--r--cloud_print/virtual_driver/win/port_monitor/port_monitor.cc2
-rw-r--r--cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc2
3 files changed, 6 insertions, 6 deletions
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc
index e5a249e..510370f 100644
--- a/cloud_print/virtual_driver/win/install/setup.cc
+++ b/cloud_print/virtual_driver/win/install/setup.cc
@@ -391,7 +391,7 @@ bool IsOSSupported() {
HRESULT RegisterVirtualDriver(const base::FilePath& install_path) {
HRESULT result = S_OK;
- DCHECK(file_util::DirectoryExists(install_path));
+ DCHECK(base::DirectoryExists(install_path));
if (!IsOSSupported()) {
LOG(ERROR) << "Requires XP SP3 or later.";
return HRESULT_FROM_WIN32(ERROR_OLD_WIN_VERSION);
@@ -477,7 +477,7 @@ HRESULT DoRegister(const base::FilePath& install_path) {
HRESULT DoDelete(const base::FilePath& install_path) {
if (install_path.value().empty())
return E_INVALIDARG;
- if (!file_util::DirectoryExists(install_path))
+ if (!base::DirectoryExists(install_path))
return S_FALSE;
Sleep(5000); // Give parent some time to exit.
return base::Delete(install_path, true) ? S_OK : E_FAIL;
@@ -492,7 +492,7 @@ HRESULT DoInstall(const base::FilePath& install_path) {
base::FilePath old_install_path = GetInstallLocation(kUninstallId);
if (!old_install_path.value().empty() &&
install_path != old_install_path) {
- if (file_util::DirectoryExists(old_install_path))
+ if (base::DirectoryExists(old_install_path))
base::Delete(old_install_path, true);
}
CreateUninstallKey(kUninstallId, LoadLocalString(IDS_DRIVER_NAME),
@@ -509,7 +509,7 @@ HRESULT ExecuteCommands() {
base::FilePath exe_path;
if (FAILED(PathService::Get(base::DIR_EXE, &exe_path)) ||
- !file_util::DirectoryExists(exe_path)) {
+ !base::DirectoryExists(exe_path)) {
return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND);
}
diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
index ad43c8f..ab235e6 100644
--- a/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
+++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor.cc
@@ -310,7 +310,7 @@ base::FilePath GetChromeExePath() {
base::FilePath GetChromeProfilePath() {
base::FilePath path = ReadPathFromAnyRegistry(kChromeProfilePathRegValue);
- if (!path.empty() && file_util::DirectoryExists(path))
+ if (!path.empty() && base::DirectoryExists(path))
return path;
return base::FilePath();
}
diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc
index 4849842..cce0327 100644
--- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc
+++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc
@@ -113,7 +113,7 @@ TEST_F(PortMonitorTest, GetChromeProfilePathTest) {
base::FilePath temp;
PathService::Get(base::DIR_TEMP, &temp);
EXPECT_EQ(data_path, temp);
- EXPECT_TRUE(file_util::DirectoryExists(data_path));
+ EXPECT_TRUE(base::DirectoryExists(data_path));
DeleteChromeExeRegistry();
data_path = cloud_print::GetChromeProfilePath();
EXPECT_TRUE(data_path.empty());