chrome/test/base/test_launcher_utils.cc - Issue 176583002: [OS X] Wire up --use-mock-keychain command line flag to encryptor module

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/base/test_launcher_utils.cc

Issue 176583002: [OS X] Wire up --use-mock-keychain command line flag to encryptor module (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/test/base/test_launcher_utils.cc

diff --git a/chrome/test/base/test_launcher_utils.cc b/chrome/test/base/test_launcher_utils.cc

index f5bf93c19b94317b69b4529e71c4289402a45650..78b6b1698b066a98ee197076252fbb26652dcfaa 100644

--- a/chrome/test/base/test_launcher_utils.cc

+++ b/chrome/test/base/test_launcher_utils.cc

@@ -12,6 +12,7 @@

#include "base/strings/string_number_conversions.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

+#include "components/encryptor/encryptor_switches.h"

#if defined(USE_AURA)

#include "ui/views/corewm/corewm_switches.h"

@@ -65,7 +66,7 @@ void PrepareBrowserCommandLineForTests(CommandLine* command_line) {

#if defined(OS_MACOSX)

// Use mock keychain on mac to prevent blocking permissions dialogs.

- command_line->AppendSwitch(switches::kUseMockKeychain);

+ command_line->AppendSwitch(encryptor::switches::kUseMockKeychain);

#endif

command_line->AppendSwitch(switches::kDisableComponentUpdate);

« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | components/encryptor.gypi » ('j') | components/encryptor/encryptor_switches.h » ('J')