OLD | NEW |
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 "chrome/browser/history/android/sqlite_cursor.h" | 5 #include "chrome/browser/history/android/sqlite_cursor.h" |
6 | 6 |
7 #include <jni.h> | 7 #include <jni.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
11 #include "base/android/jni_array.h" | 11 #include "base/android/jni_array.h" |
12 #include "base/android/jni_string.h" | 12 #include "base/android/jni_string.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
| 15 #include "base/message_loop/message_loop.h" |
15 #include "base/run_loop.h" | 16 #include "base/run_loop.h" |
16 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
17 #include "base/task/cancelable_task_tracker.h" | 18 #include "base/task/cancelable_task_tracker.h" |
18 #include "base/time/time.h" | 19 #include "base/time/time.h" |
19 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 20 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
20 #include "chrome/browser/history/android/android_history_provider_service.h" | 21 #include "chrome/browser/history/android/android_history_provider_service.h" |
21 #include "chrome/browser/history/history_service_factory.h" | 22 #include "chrome/browser/history/history_service_factory.h" |
22 #include "chrome/common/chrome_constants.h" | 23 #include "chrome/common/chrome_constants.h" |
23 #include "chrome/test/base/testing_browser_process.h" | 24 #include "chrome/test/base/testing_browser_process.h" |
24 #include "chrome/test/base/testing_profile.h" | 25 #include "chrome/test/base/testing_profile.h" |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 cursor->GetBlob(env, NULL, 3); | 219 cursor->GetBlob(env, NULL, 3); |
219 std::vector<uint8_t> out; | 220 std::vector<uint8_t> out; |
220 base::android::JavaByteArrayToByteVector(env, data.obj(), &out); | 221 base::android::JavaByteArrayToByteVector(env, data.obj(), &out); |
221 EXPECT_EQ(data_bytes->data().size(), out.size()); | 222 EXPECT_EQ(data_bytes->data().size(), out.size()); |
222 EXPECT_EQ(data_bytes->data()[0], out[0]); | 223 EXPECT_EQ(data_bytes->data()[0], out[0]); |
223 cursor->Destroy(env, NULL); | 224 cursor->Destroy(env, NULL); |
224 // Cursor::Destroy posts the task in UI thread, run Message loop to release | 225 // Cursor::Destroy posts the task in UI thread, run Message loop to release |
225 // the statement, delete SQLiteCursor itself etc. | 226 // the statement, delete SQLiteCursor itself etc. |
226 content::RunAllPendingInMessageLoop(); | 227 content::RunAllPendingInMessageLoop(); |
227 } | 228 } |
OLD | NEW |