Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / extension_browsertest.h

diff --git a/src/chrome/browser/extensions/extension_browsertest.h b/src/chrome/browser/extensions/extension_browsertest.h
index cdd7614..d5a9b58 100644 (file)
--- a/src/chrome/browser/extensions/extension_browsertest.h
+++ b/src/chrome/browser/extensions/extension_browsertest.h
@@ -11,6 +11,7 @@
 
 #include "base/files/file_path.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/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -232,11 +233,6 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest {
 
   void EnableExtension(const std::string& extension_id);
 
-  // Wait for the total number of page actions to change to |count|.
-  bool WaitForPageActionCountChangeTo(int count) {
-    return observer_->WaitForPageActionCountChangeTo(count);
-  }
-
   // Wait for the number of visible page actions to change to |count|.
   bool WaitForPageActionVisibilityChangeTo(int count) {
     return observer_->WaitForPageActionVisibilityChangeTo(count);
@@ -380,6 +376,15 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest {
   extensions::FeatureSwitch::ScopedOverride
       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.
   Profile* profile_;