summaryrefslogtreecommitdiffstats
path: root/net/http/http_cache.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/http/http_cache.cc')
-rw-r--r--net/http/http_cache.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index f629243..dad0d85 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -31,6 +31,7 @@
#include <algorithm>
+#include "base/compiler_specific.h"
#include "base/message_loop.h"
#include "base/pickle.h"
#include "base/ref_counted.h"
@@ -45,8 +46,6 @@
#include "net/http/http_transaction.h"
#include "net/http/http_util.h"
-#pragma warning(disable: 4355)
-
namespace net {
// disk cache entry data indices.
@@ -196,9 +195,12 @@ class HttpCache::Transaction : public HttpTransaction,
read_offset_(0),
effective_load_flags_(0),
final_upload_progress_(0),
- network_info_callback_(this, &Transaction::OnNetworkInfoAvailable),
- network_read_callback_(this, &Transaction::OnNetworkReadCompleted),
- cache_read_callback_(this, &Transaction::OnCacheReadCompleted) {
+ ALLOW_THIS_IN_INITIALIZER_LIST(
+ network_info_callback_(this, &Transaction::OnNetworkInfoAvailable)),
+ ALLOW_THIS_IN_INITIALIZER_LIST(
+ network_read_callback_(this, &Transaction::OnNetworkReadCompleted)),
+ ALLOW_THIS_IN_INITIALIZER_LIST(
+ cache_read_callback_(this, &Transaction::OnCacheReadCompleted)) {
AddRef(); // Balanced in Destroy
}