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

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

Issue 9358028: Upstream Android JNI code, allowing us to use more ScopedJava references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
« base/android/jni_string.h ('K') | « base/base.gypi ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/file_path.h" 8 #include "base/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 PathService::RegisterProvider(&PathTestProviderAndroid, base::DIR_MODULE, 172 PathService::RegisterProvider(&PathTestProviderAndroid, base::DIR_MODULE,
173 base::DIR_MODULE + 1); 173 base::DIR_MODULE + 1);
174 PathService::RegisterProvider(&PathTestProviderAndroid, base::DIR_CACHE, 174 PathService::RegisterProvider(&PathTestProviderAndroid, base::DIR_CACHE,
175 base::DIR_CACHE + 1); 175 base::DIR_CACHE + 1);
176 PathService::RegisterProvider(&PathTestProviderAndroid, 176 PathService::RegisterProvider(&PathTestProviderAndroid,
177 base::DIR_ANDROID_APP_DATA, base::DIR_ANDROID_APP_DATA + 1); 177 base::DIR_ANDROID_APP_DATA, base::DIR_ANDROID_APP_DATA + 1);
178 178
179 MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub); 179 MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub);
180 } 180 }
181 181
182 // TODO(michaelbai): The below DetachFromVM was added because we excluded the
183 // jni_android.{h|cc} which require JNI to compile. Remove them when those 2
184 // files added.
185 namespace base { 182 namespace base {
186 183
187 namespace android {
188
189 void DetachFromVM() {}
190
191 } // namespace android
192
193 // TODO(michaelbai): The below MessagePumpForUI were added because we excluded 184 // TODO(michaelbai): The below MessagePumpForUI were added because we excluded
194 // message_pump_android.{h|cc} which require JNI to compile. Remove them when 185 // message_pump_android.{h|cc} which require JNI to compile. Remove them when
195 // those 2 files added. 186 // those 2 files added.
196 MessagePumpForUI::MessagePumpForUI() 187 MessagePumpForUI::MessagePumpForUI()
197 : state_(NULL) { 188 : state_(NULL) {
198 } 189 }
199 190
200 MessagePumpForUI::~MessagePumpForUI() {} 191 MessagePumpForUI::~MessagePumpForUI() {}
201 192
202 void MessagePumpForUI::Run(Delegate* delegate) {} 193 void MessagePumpForUI::Run(Delegate* delegate) {}
203 194
204 void MessagePumpForUI::Start(Delegate* delegate) {} 195 void MessagePumpForUI::Start(Delegate* delegate) {}
205 196
206 void MessagePumpForUI::Quit() {} 197 void MessagePumpForUI::Quit() {}
207 198
208 void MessagePumpForUI::ScheduleWork() {} 199 void MessagePumpForUI::ScheduleWork() {}
209 200
210 void MessagePumpForUI::ScheduleDelayedWork(const TimeTicks& delayed_work_time) { 201 void MessagePumpForUI::ScheduleDelayedWork(const TimeTicks& delayed_work_time) {
211 } 202 }
212 203
213 // TODO(michaelbai): The below PathProviderAndroid was added because we 204 // TODO(michaelbai): The below PathProviderAndroid was added because we
214 // excluded base_paths_android.cc which requires JNI to compile. Remove them 205 // excluded base_paths_android.cc which requires JNI to compile. Remove them
215 // when this file added. 206 // when this file added.
216 bool PathProviderAndroid(int key, FilePath* result) { 207 bool PathProviderAndroid(int key, FilePath* result) {
217 return false; 208 return false;
218 } 209 }
219 210
220 } // namespace base 211 } // namespace base
OLDNEW
« base/android/jni_string.h ('K') | « base/base.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698