| Index: chrome/browser/android/history_report/delta_file_service.cc
|
| diff --git a/chrome/browser/android/history_report/delta_file_service.cc b/chrome/browser/android/history_report/delta_file_service.cc
|
| index c4532f4eca0817e59ebf76eca27650fb7bb58293..ce0f661797840e2761e0f0b7d7f159136d73c383 100644
|
| --- a/chrome/browser/android/history_report/delta_file_service.cc
|
| +++ b/chrome/browser/android/history_report/delta_file_service.cc
|
| @@ -23,19 +23,19 @@ void DoDeletePage(history_report::DeltaFileBackend* backend, const GURL& url) {
|
| }
|
|
|
| void DoTrim(history_report::DeltaFileBackend* backend,
|
| - int64 lower_bound,
|
| + int64_t lower_bound,
|
| base::WaitableEvent* finished,
|
| - int64* result) {
|
| + int64_t* result) {
|
| *result = backend->Trim(lower_bound);
|
| finished->Signal();
|
| }
|
|
|
| void DoQuery(
|
| history_report::DeltaFileBackend* backend,
|
| - int64 last_seq_no,
|
| - int32 limit,
|
| + int64_t last_seq_no,
|
| + int32_t limit,
|
| base::WaitableEvent* finished,
|
| - scoped_ptr<std::vector<history_report::DeltaFileEntryWithData> >* result) {
|
| + scoped_ptr<std::vector<history_report::DeltaFileEntryWithData>>* result) {
|
| *result = backend->Query(last_seq_no, limit).Pass();
|
| finished->Signal();
|
| }
|
| @@ -94,8 +94,8 @@ void DeltaFileService::PageDeleted(const GURL& url) {
|
| base::SequencedWorkerPool::BLOCK_SHUTDOWN);
|
| }
|
|
|
| -int64 DeltaFileService::Trim(int64 lower_bound) {
|
| - int64 result;
|
| +int64_t DeltaFileService::Trim(int64_t lower_bound) {
|
| + int64_t result;
|
| base::WaitableEvent finished(false, false);
|
| base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
|
| pool->PostSequencedWorkerTaskWithShutdownBehavior(
|
| @@ -111,9 +111,9 @@ int64 DeltaFileService::Trim(int64 lower_bound) {
|
| return result;
|
| }
|
|
|
| -scoped_ptr<std::vector<DeltaFileEntryWithData> > DeltaFileService::Query(
|
| - int64 last_seq_no,
|
| - int32 limit) {
|
| +scoped_ptr<std::vector<DeltaFileEntryWithData>> DeltaFileService::Query(
|
| + int64_t last_seq_no,
|
| + int32_t limit) {
|
| scoped_ptr<std::vector<DeltaFileEntryWithData> > result;
|
| base::WaitableEvent finished(false, false);
|
| base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
|
|
|