Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1778)

Unified Diff: base/path_service_unittest.cc

Issue 432273005: Fix shortcut tests and remove legacy shortcut code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't check system-level Quick Launch folder on uninstall. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base_paths_win.cc ('k') | chrome/installer/setup/install.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/path_service_unittest.cc
diff --git a/base/path_service_unittest.cc b/base/path_service_unittest.cc
index 7a70a89c41a97b03abc75e6a56994ec0cbf00da8..a345262730ca5f985e99eeb6638fc8844f6e3795 100644
--- a/base/path_service_unittest.cc
+++ b/base/path_service_unittest.cc
@@ -15,10 +15,7 @@
#include "testing/platform_test.h"
#if defined(OS_WIN)
-#include <userenv.h>
#include "base/win/windows_version.h"
-// userenv.dll is required for GetDefaultUserProfileDirectory().
-#pragma comment(lib, "userenv.lib")
#endif
namespace {
@@ -45,18 +42,7 @@ bool ReturnsValidPath(int dir_type) {
check_path_exists = false;
#endif
#if defined(OS_WIN)
- if (dir_type == base::DIR_DEFAULT_USER_QUICK_LAUNCH) {
- // On Windows XP, the Quick Launch folder for the "Default User" doesn't
- // exist by default. At least confirm that the path returned begins with the
- // Default User's profile path.
- if (base::win::GetVersion() < base::win::VERSION_VISTA) {
- wchar_t default_profile_path[MAX_PATH];
- DWORD size = arraysize(default_profile_path);
- return (result &&
- ::GetDefaultUserProfileDirectory(default_profile_path, &size) &&
- StartsWith(path.value(), default_profile_path, false));
- }
- } else if (dir_type == base::DIR_TASKBAR_PINS) {
+ if (dir_type == base::DIR_TASKBAR_PINS) {
// There is no pinned-to-taskbar shortcuts prior to Win7.
if (base::win::GetVersion() < base::win::VERSION_WIN7)
check_path_exists = false;
« no previous file with comments | « base/base_paths_win.cc ('k') | chrome/installer/setup/install.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698