| Index: chrome/browser/android/history_report/usage_reports_buffer_service.cc
|
| diff --git a/chrome/browser/android/history_report/usage_reports_buffer_service.cc b/chrome/browser/android/history_report/usage_reports_buffer_service.cc
|
| index 620e2626ef0e7cacedc15b828987395f76926a7f..4d8680da05faa9436e35cd329ba0ab89c4e037a5 100644
|
| --- a/chrome/browser/android/history_report/usage_reports_buffer_service.cc
|
| +++ b/chrome/browser/android/history_report/usage_reports_buffer_service.cc
|
| @@ -20,7 +20,7 @@ void DoInit(history_report::UsageReportsBufferBackend* backend) {
|
|
|
| void DoAddVisit(history_report::UsageReportsBufferBackend* backend,
|
| const std::string id,
|
| - int64 timestamp_ms,
|
| + int64_t timestamp_ms,
|
| bool typed_visit) {
|
| backend->AddVisit(id, timestamp_ms, typed_visit);
|
| }
|
| @@ -34,9 +34,9 @@ void DoRemove(history_report::UsageReportsBufferBackend* backend,
|
|
|
| void DoGetUsageReportsBatch(
|
| history_report::UsageReportsBufferBackend* backend,
|
| - int32 batch_size,
|
| + int32_t batch_size,
|
| base::WaitableEvent* finished,
|
| - scoped_ptr<std::vector<history_report::UsageReport> >* result) {
|
| + scoped_ptr<std::vector<history_report::UsageReport>>* result) {
|
| *result = backend->GetUsageReportsBatch(batch_size).Pass();
|
| finished->Signal();
|
| }
|
| @@ -79,8 +79,8 @@ void UsageReportsBufferService::Init() {
|
| }
|
|
|
| void UsageReportsBufferService::AddVisit(const std::string& id,
|
| - int64 timestamp_ms,
|
| - bool typed_visit) {
|
| + int64_t timestamp_ms,
|
| + bool typed_visit) {
|
| base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
|
| pool->PostSequencedWorkerTaskWithShutdownBehavior(
|
| worker_pool_token_,
|
| @@ -93,8 +93,8 @@ void UsageReportsBufferService::AddVisit(const std::string& id,
|
| base::SequencedWorkerPool::BLOCK_SHUTDOWN);
|
| }
|
|
|
| -scoped_ptr<std::vector<UsageReport> >
|
| -UsageReportsBufferService::GetUsageReportsBatch(int32 batch_size) {
|
| +scoped_ptr<std::vector<UsageReport>>
|
| +UsageReportsBufferService::GetUsageReportsBatch(int32_t batch_size) {
|
| scoped_ptr<std::vector<UsageReport> > result;
|
| base::WaitableEvent finished(false, false);
|
| base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();
|
|
|