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

Side by Side Diff: content/shell/android/browsertests_apk/content_browser_tests_android.cc

Issue 265263004: Mac Video Capture Device: split VCD into VCD and Factory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reconnected VCDFMac::Create() check for device name; VCDTest::OpenInvalidDevice needs Mac API Type. Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/shell/DEPS ('k') | content/test/content_test_launcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This class sets up the environment for running the content browser tests 5 // This class sets up the environment for running the content browser tests
6 // inside an android application. 6 // inside an android application.
7 7
8 #include <android/log.h> 8 #include <android/log.h>
9 #include <unistd.h> 9 #include <unistd.h>
10 10
(...skipping 11 matching lines...) Expand all
22 #include "base/strings/string_util.h" 22 #include "base/strings/string_util.h"
23 #include "base/strings/stringprintf.h" 23 #include "base/strings/stringprintf.h"
24 #include "content/public/app/android_library_loader_hooks.h" 24 #include "content/public/app/android_library_loader_hooks.h"
25 #include "content/public/app/content_main.h" 25 #include "content/public/app/content_main.h"
26 #include "content/public/common/content_switches.h" 26 #include "content/public/common/content_switches.h"
27 #include "content/public/test/nested_message_pump_android.h" 27 #include "content/public/test/nested_message_pump_android.h"
28 #include "content/public/test/test_launcher.h" 28 #include "content/public/test/test_launcher.h"
29 #include "content/shell/android/shell_jni_registrar.h" 29 #include "content/shell/android/shell_jni_registrar.h"
30 #include "content/shell/app/shell_main_delegate.h" 30 #include "content/shell/app/shell_main_delegate.h"
31 #include "jni/ContentBrowserTestsActivity_jni.h" 31 #include "jni/ContentBrowserTestsActivity_jni.h"
32 #include "media/base/media_switches.h"
32 #include "testing/android/native_test_util.h" 33 #include "testing/android/native_test_util.h"
33 34
34 using testing::native_test_util::ArgsToArgv; 35 using testing::native_test_util::ArgsToArgv;
35 using testing::native_test_util::ParseArgsFromCommandLineFile; 36 using testing::native_test_util::ParseArgsFromCommandLineFile;
36 using testing::native_test_util::ScopedMainEntryLogger; 37 using testing::native_test_util::ScopedMainEntryLogger;
37 38
38 // The main function of the program to be wrapped as an apk. 39 // The main function of the program to be wrapped as an apk.
39 extern int main(int argc, char** argv); 40 extern int main(int argc, char** argv);
40 41
41 namespace { 42 namespace {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 114
114 if (!content::NestedMessagePumpAndroid::RegisterJni(env)) 115 if (!content::NestedMessagePumpAndroid::RegisterJni(env))
115 return -1; 116 return -1;
116 117
117 if (!content::RegisterNativesImpl(env)) 118 if (!content::RegisterNativesImpl(env))
118 return -1; 119 return -1;
119 120
120 content::SetContentMainDelegate(new content::ShellMainDelegate()); 121 content::SetContentMainDelegate(new content::ShellMainDelegate());
121 return JNI_VERSION_1_4; 122 return JNI_VERSION_1_4;
122 } 123 }
OLDNEW
« no previous file with comments | « content/shell/DEPS ('k') | content/test/content_test_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698