summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_startup_browsertest.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 23:02:34 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 23:02:34 +0000
commit4f08c83f354cb0c9d2ee5c79c39c1ad08e560cdf (patch)
tree41963c12afc6c484be43d69d1c31c242ed5b7488 /chrome/browser/extensions/extension_startup_browsertest.cc
parentd7ab056d66464c89ba336c4b466a8ad45f2afb6e (diff)
downloadchromium_src-4f08c83f354cb0c9d2ee5c79c39c1ad08e560cdf.zip
chromium_src-4f08c83f354cb0c9d2ee5c79c39c1ad08e560cdf.tar.gz
chromium_src-4f08c83f354cb0c9d2ee5c79c39c1ad08e560cdf.tar.bz2
CommandLine: add a CopySwitchesFrom() and AppendSwitchPath()
These are two common patterns in Chrome code: copying a subset of switches from one CommandLine to another, and appending a FilePath to a CommandLine. This sets me up to do a lot more deprecation in a follow-up change. Review URL: http://codereview.chromium.org/3012021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_startup_browsertest.cc')
-rw-r--r--chrome/browser/extensions/extension_startup_browsertest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index 0d056d0..165054d 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -60,9 +60,8 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {
command_line->AppendSwitch(switches::kDisableExtensions);
}
- if (!load_extension_.value().empty()) {
- command_line->AppendSwitchWithValue(switches::kLoadExtension,
- load_extension_.ToWStringHack());
+ if (!load_extension_.empty()) {
+ command_line->AppendSwitchPath(switches::kLoadExtension, load_extension_);
command_line->AppendSwitch(switches::kDisableExtensionsFileAccessCheck);
}
}