summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.cc
diff options
context:
space:
mode:
authorrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 20:42:57 +0000
committerrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 20:42:57 +0000
commit5ef835a2c91e112ecf28b589cc5b80ae53e1927f (patch)
treec367bf7148e1e5421beab1478ba1796f4fd9274c /chrome/test/ui/ui_test.cc
parentb5a507b2ce386972331f17678b46de4d95d49c02 (diff)
downloadchromium_src-5ef835a2c91e112ecf28b589cc5b80ae53e1927f.zip
chromium_src-5ef835a2c91e112ecf28b589cc5b80ae53e1927f.tar.gz
chromium_src-5ef835a2c91e112ecf28b589cc5b80ae53e1927f.tar.bz2
Move FeatureSwitch to top-level extensions/
Move FeatureSwitch to extensions/common/ Move the switches used in FeatureSwitch to extensions/common/switches.h (when necessary). Update some uses of the switches to use feature switch instead of the commandline BUG=159265 TBR=rdsmith@chromium.org (c/b/download) TBR=sky@chromium.org (c/b/ui/, c/test/ui/) Review URL: https://codereview.chromium.org/47923018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.cc')
-rw-r--r--chrome/test/ui/ui_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 5e0e248..e202ea8 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -50,6 +50,7 @@
#include "chrome/test/base/test_launcher_utils.h"
#include "chrome/test/base/test_switches.h"
#include "chrome/test/base/testing_profile.h"
+#include "extensions/common/switches.h"
#include "net/base/net_util.h"
#include "ui/gl/gl_implementation.h"
#include "url/gurl.h"
@@ -189,7 +190,7 @@ void UITestBase::SetLaunchSwitches() {
launch_arguments_.AppendSwitch(switches::kStatsCollectionController);
// Allow off-store extension installs.
launch_arguments_.AppendSwitchASCII(
- switches::kEasyOffStoreExtensionInstall, "1");
+ extensions::switches::kEasyOffStoreExtensionInstall, "1");
if (!homepage_.empty()) {
// Pass |homepage_| both as an arg (so that it opens on startup) and to the
// homepage switch (so that the homepage is set).