summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_browsertest.cc
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-21 22:21:11 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-21 22:21:11 +0000
commit1172ba7af32d7756a138b2f5d4761cb8d566f29c (patch)
treec3623ce6a47f09e08f664ed961eb28a654dd4d12 /chrome/browser/extensions/extension_browsertest.cc
parentf1c74ecbdfbe62d62668bdbeb7639284f0b455f4 (diff)
downloadchromium_src-1172ba7af32d7756a138b2f5d4761cb8d566f29c.zip
chromium_src-1172ba7af32d7756a138b2f5d4761cb8d566f29c.tar.gz
chromium_src-1172ba7af32d7756a138b2f5d4761cb8d566f29c.tar.bz2
Ensure that the default profile for cros has no extension service
BUG=chromeium-os:3232 TEST=LoginProfileTest.UserNotPassed Review URL: http://codereview.chromium.org/2094018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_browsertest.cc')
-rw-r--r--chrome/browser/extensions/extension_browsertest.cc15
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 12c5833..ce0f37d 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -25,6 +25,10 @@
#include "chrome/common/notification_type.h"
#include "chrome/test/ui_test_utils.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/common/chrome_switches.h"
+#endif
+
ExtensionBrowserTest::ExtensionBrowserTest()
: target_page_action_count_(-1),
target_visible_page_action_count_(-1) {
@@ -44,6 +48,17 @@ void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) {
// selectively enabling each of them, enable toolstrips for all extension
// tests.
command_line->AppendSwitch(switches::kEnableExtensionToolstrips);
+
+#if defined(OS_CHROMEOS)
+ // This makes sure that we create the Default profile first, with no
+ // ExtensionsService and then the real profile with one, as we do when
+ // running on chromeos.
+ command_line->AppendSwitchWithValue(
+ switches::kLoginUser, "TestUser@gmail.com");
+ command_line->AppendSwitchWithValue(switches::kLoginProfile, "user");
+ command_line->AppendSwitch(switches::kNoFirstRun);
+#endif
+
}
bool ExtensionBrowserTest::LoadExtensionImpl(const FilePath& path,