Index: chrome/browser/history/android/sqlite_cursor_unittest.cc |
diff --git a/chrome/browser/history/android/sqlite_cursor_unittest.cc b/chrome/browser/history/android/sqlite_cursor_unittest.cc |
index 63b4d8ad9236dd2ff7980906e6301eaf0024162c..c29f61d820b78fbe226c5ba18a01c4370605001f 100644 |
--- a/chrome/browser/history/android/sqlite_cursor_unittest.cc |
+++ b/chrome/browser/history/android/sqlite_cursor_unittest.cc |
@@ -5,10 +5,12 @@ |
#include "chrome/browser/history/android/sqlite_cursor.h" |
#include <jni.h> |
+#include <stdint.h> |
#include "base/android/jni_android.h" |
#include "base/android/jni_array.h" |
#include "base/android/jni_string.h" |
+#include "base/macros.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/task/cancelable_task_tracker.h" |
#include "base/time/time.h" |
@@ -119,7 +121,7 @@ class CallbackHelper : public base::RefCountedThreadSafe<CallbackHelper> { |
return statement_; |
} |
- void OnInserted(int64 id) { |
+ void OnInserted(int64_t id) { |
success_ = id != 0; |
base::MessageLoop::current()->QuitWhenIdle(); |
} |
@@ -207,7 +209,7 @@ TEST_F(SQLiteCursorTest, Run) { |
EXPECT_EQ(row.visit_count(), cursor->GetInt(env, NULL, 2)); |
base::android::ScopedJavaLocalRef<jbyteArray> data = |
cursor->GetBlob(env, NULL, 3); |
- std::vector<uint8> out; |
+ std::vector<uint8_t> out; |
base::android::JavaByteArrayToByteVector(env, data.obj(), &out); |
EXPECT_EQ(data_bytes->data().size(), out.size()); |
EXPECT_EQ(data_bytes->data()[0], out[0]); |