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

Side by Side Diff: base/test/test_support_android.cc

Issue 12047068: Add apk for running content_browsertests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 7 years, 11 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 | « base/message_loop.cc ('k') | build/java_apk.gypi » ('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 #include <stdarg.h> 5 #include <stdarg.h>
6 #include <string.h> 6 #include <string.h>
7 7
8 #include "base/android/path_utils.h" 8 #include "base/android/path_utils.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 false, // Timestamp 176 false, // Timestamp
177 false); // Tick count 177 false); // Tick count
178 } 178 }
179 179
180 void InitAndroidTestPaths() { 180 void InitAndroidTestPaths() {
181 InitPathProvider(DIR_MODULE); 181 InitPathProvider(DIR_MODULE);
182 InitPathProvider(DIR_ANDROID_APP_DATA); 182 InitPathProvider(DIR_ANDROID_APP_DATA);
183 } 183 }
184 184
185 void InitAndroidTestMessageLoop() { 185 void InitAndroidTestMessageLoop() {
186 MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub); 186 if (!MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub))
187 LOG(INFO) << "MessagePumpForUIFactory already set, unable to override.";
187 } 188 }
188 189
189 void InitAndroidTest() { 190 void InitAndroidTest() {
190 InitAndroidTestLogging(); 191 InitAndroidTestLogging();
191 InitAndroidTestPaths(); 192 InitAndroidTestPaths();
192 InitAndroidTestMessageLoop(); 193 InitAndroidTestMessageLoop();
193 } 194 }
194 } // namespace base 195 } // namespace base
OLDNEW
« no previous file with comments | « base/message_loop.cc ('k') | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698