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

Side by Side Diff: testing/android/native_test/native_test_launcher.cc

Issue 1917193003: Revert of 🍈 Unify application context usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java ('k') | no next file » | 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 native tests inside an 5 // This class sets up the environment for running the native tests inside an
6 // android application. It outputs (to a fifo) markers identifying the 6 // android application. It outputs (to a fifo) markers identifying the
7 // START/PASSED/CRASH of the test suite, FAILURE/SUCCESS of individual tests, 7 // START/PASSED/CRASH of the test suite, FAILURE/SUCCESS of individual tests,
8 // etc. 8 // etc.
9 // These markers are read by the test runner script to generate test results. 9 // These markers are read by the test runner script to generate test results.
10 // It installs signal handlers to detect crashes. 10 // It installs signal handlers to detect crashes.
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 const JavaParamRef<jstring>& jcommand_line_file_path, 70 const JavaParamRef<jstring>& jcommand_line_file_path,
71 const JavaParamRef<jstring>& jstdout_file_path, 71 const JavaParamRef<jstring>& jstdout_file_path,
72 jboolean jstdout_fifo, 72 jboolean jstdout_fifo,
73 const JavaParamRef<jobject>& app_context) { 73 const JavaParamRef<jobject>& app_context) {
74 // Command line initialized basically, will be fully initialized later. 74 // Command line initialized basically, will be fully initialized later.
75 static const char* const kInitialArgv[] = { "ChromeTestActivity" }; 75 static const char* const kInitialArgv[] = { "ChromeTestActivity" };
76 base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv); 76 base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
77 77
78 // Set the application context in base. 78 // Set the application context in base.
79 base::android::RegisterJni(env); 79 base::android::RegisterJni(env);
80 base::android::InitApplicationContext(env, app_context);
80 81
81 std::vector<std::string> args; 82 std::vector<std::string> args;
82 83
83 const std::string command_line_file_path( 84 const std::string command_line_file_path(
84 base::android::ConvertJavaStringToUTF8(env, jcommand_line_file_path)); 85 base::android::ConvertJavaStringToUTF8(env, jcommand_line_file_path));
85 if (command_line_file_path.empty()) 86 if (command_line_file_path.empty())
86 args.push_back("_"); 87 args.push_back("_");
87 else 88 else
88 ParseArgsFromCommandLineFile(command_line_file_path.c_str(), &args); 89 ParseArgsFromCommandLineFile(command_line_file_path.c_str(), &args);
89 90
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 sa.sa_sigaction = SignalHandler; 145 sa.sa_sigaction = SignalHandler;
145 sa.sa_flags = SA_SIGINFO; 146 sa.sa_flags = SA_SIGINFO;
146 147
147 for (unsigned int i = 0; kExceptionSignals[i] != -1; ++i) { 148 for (unsigned int i = 0; kExceptionSignals[i] != -1; ++i) {
148 sigaction(kExceptionSignals[i], &sa, &g_old_sa[kExceptionSignals[i]]); 149 sigaction(kExceptionSignals[i], &sa, &g_old_sa[kExceptionSignals[i]]);
149 } 150 }
150 } 151 }
151 152
152 } // namespace android 153 } // namespace android
153 } // namespace testing 154 } // namespace testing
OLDNEW
« no previous file with comments | « testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698