| Index: chrome/browser/sync_file_system/sync_process_runner.h
|
| diff --git a/chrome/browser/sync_file_system/sync_process_runner.h b/chrome/browser/sync_file_system/sync_process_runner.h
|
| index 118ca70917e89177ecc92ff85f804e586209847a..80be8d5a4eca7d1367ad87fd9ece75b6cbe38275 100644
|
| --- a/chrome/browser/sync_file_system/sync_process_runner.h
|
| +++ b/chrome/browser/sync_file_system/sync_process_runner.h
|
| @@ -5,9 +5,12 @@
|
| #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_PROCESS_RUNNER_H_
|
| #define CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_PROCESS_RUNNER_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
|
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/timer/timer.h"
|
| #include "chrome/browser/sync_file_system/sync_callbacks.h"
|
| @@ -26,22 +29,22 @@ class SyncFileSystemService;
|
| class SyncProcessRunner {
|
| public:
|
| // Default delay when more changes are available.
|
| - static const int64 kSyncDelayInMilliseconds;
|
| + static const int64_t kSyncDelayInMilliseconds;
|
|
|
| // Default delay when the previous change has had an error (but remote service
|
| // is running).
|
| - static const int64 kSyncDelayWithSyncError;
|
| + static const int64_t kSyncDelayWithSyncError;
|
|
|
| // Default delay when there're more than 10 pending changes.
|
| - static const int64 kSyncDelayFastInMilliseconds;
|
| + static const int64_t kSyncDelayFastInMilliseconds;
|
| static const int kPendingChangeThresholdForFastSync;
|
|
|
| // Default delay when remote service is temporarily unavailable.
|
| // The delay backs off exponentially from initial value on repeated failure.
|
| - static const int64 kSyncDelaySlowInMilliseconds;
|
| + static const int64_t kSyncDelaySlowInMilliseconds;
|
|
|
| // Default delay when there're no changes.
|
| - static const int64 kSyncDelayMaxInMilliseconds;
|
| + static const int64_t kSyncDelayMaxInMilliseconds;
|
|
|
| class Client {
|
| public:
|
| @@ -76,24 +79,24 @@ class SyncProcessRunner {
|
| // Schedules a new sync.
|
| void Schedule();
|
|
|
| - int64 pending_changes() const { return pending_changes_; }
|
| + int64_t pending_changes() const { return pending_changes_; }
|
|
|
| // Returns the current service state. Default implementation returns
|
| // sync_service()->GetSyncServiceState().
|
| virtual SyncServiceState GetServiceState();
|
|
|
| protected:
|
| - void OnChangesUpdated(int64 pending_changes);
|
| + void OnChangesUpdated(int64_t pending_changes);
|
| SyncFileSystemService* GetSyncService();
|
|
|
| private:
|
| void Finished(const base::TimeTicks& start_time, SyncStatusCode status);
|
| void Run();
|
| - void ScheduleInternal(int64 delay);
|
| + void ScheduleInternal(int64_t delay);
|
|
|
| // Throttles new sync for |base_delay| milliseconds for an error case.
|
| // If new sync is already throttled, back off the duration.
|
| - void ThrottleSync(int64 base_delay);
|
| + void ThrottleSync(int64_t base_delay);
|
|
|
| // Clears old throttling setting that is already over.
|
| void ResetOldThrottling();
|
| @@ -113,7 +116,7 @@ class SyncProcessRunner {
|
| base::TimeTicks throttle_from_;
|
| base::TimeTicks throttle_until_;
|
|
|
| - int64 pending_changes_;
|
| + int64_t pending_changes_;
|
| base::WeakPtrFactory<SyncProcessRunner> factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SyncProcessRunner);
|
|
|