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 "remoting/base/vlog_net_log.h" | 5 #include "remoting/base/vlog_net_log.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/json/json_writer.h" | 9 #include "base/json/json_writer.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/threading/thread_restrictions.h" | 12 #include "base/threading/thread_restrictions.h" |
13 #include "base/time/time.h" | 13 #include "base/time/time.h" |
14 #include "base/values.h" | 14 #include "base/values.h" |
| 15 #include "net/log/net_log_entry.h" |
15 | 16 |
16 namespace remoting { | 17 namespace remoting { |
17 | 18 |
18 class VlogNetLog::Observer : public net::NetLog::ThreadSafeObserver { | 19 class VlogNetLog::Observer : public net::NetLog::ThreadSafeObserver { |
19 public: | 20 public: |
20 Observer(); | 21 Observer(); |
21 ~Observer() override; | 22 ~Observer() override; |
22 | 23 |
23 // NetLog::ThreadSafeObserver overrides: | 24 // NetLog::ThreadSafeObserver overrides: |
24 void OnAddEntry(const net::NetLog::Entry& entry) override; | 25 void OnAddEntry(const net::NetLogEntry& entry) override; |
25 | 26 |
26 private: | 27 private: |
27 DISALLOW_COPY_AND_ASSIGN(Observer); | 28 DISALLOW_COPY_AND_ASSIGN(Observer); |
28 }; | 29 }; |
29 | 30 |
30 VlogNetLog::Observer::Observer() { | 31 VlogNetLog::Observer::Observer() { |
31 } | 32 } |
32 | 33 |
33 VlogNetLog::Observer::~Observer() { | 34 VlogNetLog::Observer::~Observer() { |
34 } | 35 } |
35 | 36 |
36 void VlogNetLog::Observer::OnAddEntry(const net::NetLog::Entry& entry) { | 37 void VlogNetLog::Observer::OnAddEntry(const net::NetLogEntry& entry) { |
37 if (VLOG_IS_ON(4)) { | 38 if (VLOG_IS_ON(4)) { |
38 std::unique_ptr<base::Value> value(entry.ToValue()); | 39 std::unique_ptr<base::Value> value(entry.ToValue()); |
39 std::string json; | 40 std::string json; |
40 base::JSONWriter::Write(*value, &json); | 41 base::JSONWriter::Write(*value, &json); |
41 VLOG(4) << json; | 42 VLOG(4) << json; |
42 } | 43 } |
43 } | 44 } |
44 | 45 |
45 VlogNetLog::VlogNetLog() | 46 VlogNetLog::VlogNetLog() |
46 : observer_(new Observer()) { | 47 : observer_(new Observer()) { |
47 DeprecatedAddObserver(observer_.get(), | 48 DeprecatedAddObserver(observer_.get(), |
48 net::NetLogCaptureMode::IncludeCookiesAndCredentials()); | 49 net::NetLogCaptureMode::IncludeCookiesAndCredentials()); |
49 } | 50 } |
50 | 51 |
51 VlogNetLog::~VlogNetLog() { | 52 VlogNetLog::~VlogNetLog() { |
52 DeprecatedRemoveObserver(observer_.get()); | 53 DeprecatedRemoveObserver(observer_.get()); |
53 } | 54 } |
54 | 55 |
55 } // namespace remoting | 56 } // namespace remoting |
OLD | NEW |