Add scoped path overrides for system directories for ExtensionBrowserTests.

chrome/browser/extensions/extension_browsertest.h

Index: chrome/browser/extensions/extension_browsertest.h
diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h
index 7cd69f676217ad9ba5fc5ac2f4fa6c3e59ccdb13..cf18c06ee66bf6e36b06eab2879055ebdaec8b7f 100644
--- a/chrome/browser/extensions/extension_browsertest.h
+++ b/chrome/browser/extensions/extension_browsertest.h
@@ -26,6 +26,10 @@
 class ExtensionService;
 class Profile;
 
+namespace base {
+class ScopedPathOverride;
+}
+
 namespace extensions {
 class ExtensionCacheFake;
 class ExtensionSet;
@@ -375,6 +379,13 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest {
   extensions::FeatureSwitch::ScopedOverride
       override_prompt_for_external_extensions_;
 
+  // Use mock shortcut directories to ensure app shortcuts are cleaned up.

[Yoyo Zhou, 2014/09/15 18:54:55]

This should probably be in a #if defined(OS_WIN) block (see compile failures on
non-windows).

[calamity, 2014/09/16 00:56:21]

Done.

+  scoped_ptr<base::ScopedPathOverride> user_desktop_override_;

[gab, 2014/09/16 00:01:10]

No need for scoped_ptr, a direct member is sufficient.

[calamity, 2014/09/16 00:56:21]

Done.

+  scoped_ptr<base::ScopedPathOverride> common_desktop_override_;
+  scoped_ptr<base::ScopedPathOverride> user_quick_launch_override_;
+  scoped_ptr<base::ScopedPathOverride> start_menu_override_;
+  scoped_ptr<base::ScopedPathOverride> common_start_menu_override_;
+
   // The default profile to be used.
   Profile* profile_;