OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/disk_cache/simple/simple_net_log_parameters.h" | 5 #include "net/disk_cache/simple/simple_net_log_parameters.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "base/bind.h" | 9 #include "base/bind.h" |
8 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
9 #include "base/format_macros.h" | 11 #include "base/format_macros.h" |
10 #include "base/logging.h" | 12 #include "base/logging.h" |
11 #include "base/strings/stringprintf.h" | 13 #include "base/strings/stringprintf.h" |
12 #include "base/values.h" | 14 #include "base/values.h" |
13 #include "net/base/net_errors.h" | 15 #include "net/base/net_errors.h" |
14 #include "net/disk_cache/simple/simple_entry_impl.h" | 16 #include "net/disk_cache/simple/simple_entry_impl.h" |
15 | 17 |
16 namespace { | 18 namespace { |
17 | 19 |
18 scoped_ptr<base::Value> NetLogSimpleEntryConstructionCallback( | 20 scoped_ptr<base::Value> NetLogSimpleEntryConstructionCallback( |
19 const disk_cache::SimpleEntryImpl* entry, | 21 const disk_cache::SimpleEntryImpl* entry, |
20 net::NetLogCaptureMode capture_mode) { | 22 net::NetLogCaptureMode capture_mode) { |
21 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); | 23 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
22 dict->SetString("entry_hash", | 24 dict->SetString("entry_hash", |
23 base::StringPrintf("%#016" PRIx64, entry->entry_hash())); | 25 base::StringPrintf("%#016" PRIx64, entry->entry_hash())); |
24 return dict.Pass(); | 26 return std::move(dict); |
25 } | 27 } |
26 | 28 |
27 scoped_ptr<base::Value> NetLogSimpleEntryCreationCallback( | 29 scoped_ptr<base::Value> NetLogSimpleEntryCreationCallback( |
28 const disk_cache::SimpleEntryImpl* entry, | 30 const disk_cache::SimpleEntryImpl* entry, |
29 int net_error, | 31 int net_error, |
30 net::NetLogCaptureMode /* capture_mode */) { | 32 net::NetLogCaptureMode /* capture_mode */) { |
31 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); | 33 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
32 dict->SetInteger("net_error", net_error); | 34 dict->SetInteger("net_error", net_error); |
33 if (net_error == net::OK) | 35 if (net_error == net::OK) |
34 dict->SetString("key", entry->key()); | 36 dict->SetString("key", entry->key()); |
35 return dict.Pass(); | 37 return std::move(dict); |
36 } | 38 } |
37 | 39 |
38 } // namespace | 40 } // namespace |
39 | 41 |
40 namespace disk_cache { | 42 namespace disk_cache { |
41 | 43 |
42 net::NetLog::ParametersCallback CreateNetLogSimpleEntryConstructionCallback( | 44 net::NetLog::ParametersCallback CreateNetLogSimpleEntryConstructionCallback( |
43 const SimpleEntryImpl* entry) { | 45 const SimpleEntryImpl* entry) { |
44 DCHECK(entry); | 46 DCHECK(entry); |
45 return base::Bind(&NetLogSimpleEntryConstructionCallback, entry); | 47 return base::Bind(&NetLogSimpleEntryConstructionCallback, entry); |
46 } | 48 } |
47 | 49 |
48 net::NetLog::ParametersCallback CreateNetLogSimpleEntryCreationCallback( | 50 net::NetLog::ParametersCallback CreateNetLogSimpleEntryCreationCallback( |
49 const SimpleEntryImpl* entry, | 51 const SimpleEntryImpl* entry, |
50 int net_error) { | 52 int net_error) { |
51 DCHECK(entry); | 53 DCHECK(entry); |
52 return base::Bind(&NetLogSimpleEntryCreationCallback, entry, net_error); | 54 return base::Bind(&NetLogSimpleEntryCreationCallback, entry, net_error); |
53 } | 55 } |
54 | 56 |
55 } // namespace disk_cache | 57 } // namespace disk_cache |
OLD | NEW |