diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-01 19:41:02 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-01 19:41:02 +0000 |
commit | 918efbf64de58c82ffa3cd8799d9ad822811a37a (patch) | |
tree | 5ceffb5e1576177d75f1aa8546bcae074df63c1e /chrome/browser/web_applications | |
parent | e07f44f6b208541c9602bb9cc5f311612aaab64a (diff) | |
download | chromium_src-918efbf64de58c82ffa3cd8799d9ad822811a37a.zip chromium_src-918efbf64de58c82ffa3cd8799d9ad822811a37a.tar.gz chromium_src-918efbf64de58c82ffa3cd8799d9ad822811a37a.tar.bz2 |
Move file_util::Delete to the base namespace
BUG=
Review URL: https://codereview.chromium.org/16950028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209475 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_applications')
-rw-r--r-- | chrome/browser/web_applications/web_app_mac.mm | 10 | ||||
-rw-r--r-- | chrome/browser/web_applications/web_app_mac_unittest.mm | 4 | ||||
-rw-r--r-- | chrome/browser/web_applications/web_app_win.cc | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm index e4e3c0c..8a004eb 100644 --- a/chrome/browser/web_applications/web_app_mac.mm +++ b/chrome/browser/web_applications/web_app_mac.mm @@ -229,10 +229,10 @@ void UpdateAppShortcutsSubdirLocalizedName( void DeletePathAndParentIfEmpty(const base::FilePath& app_path) { DCHECK(!app_path.empty()); - file_util::Delete(app_path, true); + base::Delete(app_path, true); base::FilePath apps_folder = app_path.DirName(); if (file_util::IsDirectoryEmpty(apps_folder)) - file_util::Delete(apps_folder, false); + base::Delete(apps_folder, false); } } // namespace @@ -361,7 +361,7 @@ void WebAppShortcutCreator::DeleteShortcuts() { // In case the user has moved/renamed/copied the app bundle. base::FilePath bundle_path = GetAppBundleById(GetBundleIdentifier()); if (!bundle_path.empty()) - file_util::Delete(bundle_path, true); + base::Delete(bundle_path, true); // Delete the internal one. DeletePathAndParentIfEmpty(app_data_path_.Append(GetShortcutName())); @@ -369,7 +369,7 @@ void WebAppShortcutCreator::DeleteShortcuts() { bool WebAppShortcutCreator::UpdateShortcuts() { std::vector<base::FilePath> paths; - file_util::Delete(app_data_path_.Append(GetShortcutName()), true); + base::Delete(app_data_path_.Append(GetShortcutName()), true); paths.push_back(app_data_path_); base::FilePath dst_path = GetDestinationPath(); @@ -381,7 +381,7 @@ bool WebAppShortcutCreator::UpdateShortcuts() { app_path = GetAppBundleById(GetBundleIdentifier()); if (!app_path.empty()) { - file_util::Delete(app_path, true); + base::Delete(app_path, true); paths.push_back(app_path.DirName()); } diff --git a/chrome/browser/web_applications/web_app_mac_unittest.mm b/chrome/browser/web_applications/web_app_mac_unittest.mm index 09bc976..a96ff4c 100644 --- a/chrome/browser/web_applications/web_app_mac_unittest.mm +++ b/chrome/browser/web_applications/web_app_mac_unittest.mm @@ -139,7 +139,7 @@ TEST(WebAppShortcutCreatorTest, UpdateShortcuts) { shortcut_creator.BuildShortcut(other_folder.Append(app_name)); - EXPECT_TRUE(file_util::Delete( + EXPECT_TRUE(base::Delete( other_folder.Append(app_name).Append("Contents"), true)); EXPECT_TRUE(shortcut_creator.UpdateShortcuts()); @@ -153,7 +153,7 @@ TEST(WebAppShortcutCreatorTest, UpdateShortcuts) { shortcut_creator.BuildShortcut(other_folder.Append(app_name)); - EXPECT_TRUE(file_util::Delete( + EXPECT_TRUE(base::Delete( other_folder.Append(app_name).Append("Contents"), true)); EXPECT_FALSE(shortcut_creator.UpdateShortcuts()); diff --git a/chrome/browser/web_applications/web_app_win.cc b/chrome/browser/web_applications/web_app_win.cc index be49240..e174eb8 100644 --- a/chrome/browser/web_applications/web_app_win.cc +++ b/chrome/browser/web_applications/web_app_win.cc @@ -281,7 +281,7 @@ void GetShortcutLocationsAndDeleteShortcuts( // Any shortcut could have been pinned, either by chrome or the user, so // they are all unpinned. base::win::TaskbarUnpinShortcutLink(j->value().c_str()); - file_util::Delete(*j, false); + base::Delete(*j, false); } } } @@ -419,7 +419,7 @@ void DeletePlatformShortcuts( if (PathService::Get(base::DIR_START_MENU, &chrome_apps_dir)) { chrome_apps_dir = chrome_apps_dir.Append(GetAppShortcutsSubdirName()); if (file_util::IsDirectoryEmpty(chrome_apps_dir)) - file_util::Delete(chrome_apps_dir, false); + base::Delete(chrome_apps_dir, false); } } |