| Index: content/browser/appcache/appcache_host.cc
|
| diff --git a/content/browser/appcache/appcache_host.cc b/content/browser/appcache/appcache_host.cc
|
| index 9ec45f6174f13bf95478b28ee02029bccbb96cbd..697b2bdf8d0432babc5b3fc057e7d9b22c49ac88 100644
|
| --- a/content/browser/appcache/appcache_host.cc
|
| +++ b/content/browser/appcache/appcache_host.cc
|
| @@ -81,7 +81,7 @@ void AppCacheHost::RemoveObserver(Observer* observer) {
|
| }
|
|
|
| bool AppCacheHost::SelectCache(const GURL& document_url,
|
| - const int64 cache_document_was_loaded_from,
|
| + const int64_t cache_document_was_loaded_from,
|
| const GURL& manifest_url) {
|
| if (was_select_cache_called_)
|
| return false;
|
| @@ -170,7 +170,7 @@ bool AppCacheHost::SelectCacheForWorker(int parent_process_id,
|
| return true;
|
| }
|
|
|
| -bool AppCacheHost::SelectCacheForSharedWorker(int64 appcache_id) {
|
| +bool AppCacheHost::SelectCacheForSharedWorker(int64_t appcache_id) {
|
| if (was_select_cache_called_)
|
| return false;
|
|
|
| @@ -190,7 +190,7 @@ bool AppCacheHost::SelectCacheForSharedWorker(int64 appcache_id) {
|
|
|
| // TODO(michaeln): change method name to MarkEntryAsForeign for consistency
|
| bool AppCacheHost::MarkAsForeignEntry(const GURL& document_url,
|
| - int64 cache_document_was_loaded_from) {
|
| + int64_t cache_document_was_loaded_from) {
|
| if (was_select_cache_called_)
|
| return false;
|
|
|
| @@ -378,13 +378,13 @@ void AppCacheHost::OnGroupLoaded(AppCacheGroup* group,
|
| FinishCacheSelection(NULL, group);
|
| }
|
|
|
| -void AppCacheHost::LoadSelectedCache(int64 cache_id) {
|
| +void AppCacheHost::LoadSelectedCache(int64_t cache_id) {
|
| DCHECK(cache_id != kAppCacheNoCacheId);
|
| pending_selected_cache_id_ = cache_id;
|
| storage()->LoadCache(cache_id, this);
|
| }
|
|
|
| -void AppCacheHost::OnCacheLoaded(AppCache* cache, int64 cache_id) {
|
| +void AppCacheHost::OnCacheLoaded(AppCache* cache, int64_t cache_id) {
|
| if (cache_id == pending_main_resource_cache_id_) {
|
| pending_main_resource_cache_id_ = kAppCacheNoCacheId;
|
| main_resource_cache_ = cache;
|
| @@ -503,7 +503,7 @@ void AppCacheHost::SetSwappableCache(AppCacheGroup* group) {
|
| }
|
| }
|
|
|
| -void AppCacheHost::LoadMainResourceCache(int64 cache_id) {
|
| +void AppCacheHost::LoadMainResourceCache(int64_t cache_id) {
|
| DCHECK(cache_id != kAppCacheNoCacheId);
|
| if (pending_main_resource_cache_id_ == cache_id ||
|
| (main_resource_cache_.get() &&
|
|
|