Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8628)

Unified Diff: content/shell/android/browsertests_apk/content_browser_tests_android.cc

Issue 12796005: Android: Add some required commmandline flags for running content_browsertests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
« no previous file with comments | « build/android/pylib/gtest/filter/content_browsertests_disabled ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/android/browsertests_apk/content_browser_tests_android.cc
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/content/shell/android/browsertests_apk/content_browser_tests_android.cc
index 3eba8844afbbb5f350c59772568e8c888a2aa965..cb4c120465255f0abdf18c36ec41263da1f38a4f 100644
--- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc
+++ b/content/shell/android/browsertests_apk/content_browser_tests_android.cc
@@ -21,6 +21,8 @@
#include "base/strings/string_tokenizer.h"
#include "content/public/app/android_library_loader_hooks.h"
#include "content/public/app/content_main.h"
+#include "content/public/common/content_switches.h"
+#include "content/public/test/test_launcher.h"
#include "content/shell/android/shell_jni_registrar.h"
#include "content/shell/shell_main_delegate.h"
#include "content/test/browser_test_message_pump_android.h"
@@ -69,8 +71,12 @@ static void RunTests(JNIEnv* env,
int argc = ArgsToArgv(args, &argv);
// Fully initialize command line with arguments.
- CommandLine::ForCurrentProcess()->AppendArguments(
- CommandLine(argc, &argv[0]), false);
+ CommandLine* command_line = CommandLine::ForCurrentProcess();
+ command_line->AppendArguments(CommandLine(argc, &argv[0]), false);
+
+ // Append required switches.
+ command_line->AppendSwitch(content::kSingleProcessTestsFlag);
+ command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
// Create fifo and redirect stdout and stderr to it.
base::FilePath files_dir(
« no previous file with comments | « build/android/pylib/gtest/filter/content_browsertests_disabled ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698