Commit 6c0732b8 authored by calamity's avatar calamity Committed by Commit bot

Add scoped path overrides for system directories for ExtensionBrowserTests.

This CL adds path overrides for shortcut directories in testing environments.
This will ensure tests don't pollute the build bots with shortcuts

BUG=411970

Review URL: https://codereview.chromium.org/565523003

Cr-Commit-Position: refs/heads/master@{#295012}
parent f0386423
...@@ -69,6 +69,13 @@ ExtensionBrowserTest::ExtensionBrowserTest() ...@@ -69,6 +69,13 @@ ExtensionBrowserTest::ExtensionBrowserTest()
override_prompt_for_external_extensions_( override_prompt_for_external_extensions_(
FeatureSwitch::prompt_for_external_extensions(), FeatureSwitch::prompt_for_external_extensions(),
false), false),
#if defined(OS_WIN)
user_desktop_override_(base::DIR_USER_DESKTOP),
common_desktop_override_(base::DIR_COMMON_DESKTOP),
user_quick_launch_override_(base::DIR_USER_QUICK_LAUNCH),
start_menu_override_(base::DIR_START_MENU),
common_start_menu_override_(base::DIR_COMMON_START_MENU),
#endif
profile_(NULL) { profile_(NULL) {
EXPECT_TRUE(temp_dir_.CreateUniqueTempDir()); EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
} }
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h" #include "base/files/scoped_temp_dir.h"
#include "base/test/scoped_path_override.h"
#include "chrome/browser/extensions/extension_test_notification_observer.h" #include "chrome/browser/extensions/extension_test_notification_observer.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
...@@ -375,6 +376,15 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest { ...@@ -375,6 +376,15 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest {
extensions::FeatureSwitch::ScopedOverride extensions::FeatureSwitch::ScopedOverride
override_prompt_for_external_extensions_; override_prompt_for_external_extensions_;
#if defined(OS_WIN)
// Use mock shortcut directories to ensure app shortcuts are cleaned up.
base::ScopedPathOverride user_desktop_override_;
base::ScopedPathOverride common_desktop_override_;
base::ScopedPathOverride user_quick_launch_override_;
base::ScopedPathOverride start_menu_override_;
base::ScopedPathOverride common_start_menu_override_;
#endif
// The default profile to be used. // The default profile to be used.
Profile* profile_; Profile* profile_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment