| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef COMPONENTS_NET_LOG_CHROME_NET_LOG_H_ | 5 #ifndef COMPONENTS_NET_LOG_CHROME_NET_LOG_H_ |
| 6 #define COMPONENTS_NET_LOG_CHROME_NET_LOG_H_ | 6 #define COMPONENTS_NET_LOG_CHROME_NET_LOG_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 8 #include <string> | 9 #include <string> |
| 9 | 10 |
| 10 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 11 #include "base/macros.h" | 12 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | |
| 13 #include "net/log/net_log.h" | 13 #include "net/log/net_log.h" |
| 14 | 14 |
| 15 namespace base { | 15 namespace base { |
| 16 class FilePath; | 16 class FilePath; |
| 17 class Value; | 17 class Value; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace net { | 20 namespace net { |
| 21 class WriteToFileNetLogObserver; | 21 class WriteToFileNetLogObserver; |
| 22 class TraceNetLogObserver; | 22 class TraceNetLogObserver; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 42 | 42 |
| 43 NetLogTempFile* net_log_temp_file() { return net_log_temp_file_.get(); } | 43 NetLogTempFile* net_log_temp_file() { return net_log_temp_file_.get(); } |
| 44 | 44 |
| 45 // Returns a Value containing constants needed to load a log file. | 45 // Returns a Value containing constants needed to load a log file. |
| 46 // Safe to call on any thread. Caller takes ownership of the returned Value. | 46 // Safe to call on any thread. Caller takes ownership of the returned Value. |
| 47 static base::Value* GetConstants( | 47 static base::Value* GetConstants( |
| 48 const base::CommandLine::StringType& command_line_string, | 48 const base::CommandLine::StringType& command_line_string, |
| 49 const std::string& channel_string); | 49 const std::string& channel_string); |
| 50 | 50 |
| 51 private: | 51 private: |
| 52 scoped_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_; | 52 std::unique_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_; |
| 53 scoped_ptr<NetLogTempFile> net_log_temp_file_; | 53 std::unique_ptr<NetLogTempFile> net_log_temp_file_; |
| 54 scoped_ptr<net::TraceNetLogObserver> trace_net_log_observer_; | 54 std::unique_ptr<net::TraceNetLogObserver> trace_net_log_observer_; |
| 55 | 55 |
| 56 DISALLOW_COPY_AND_ASSIGN(ChromeNetLog); | 56 DISALLOW_COPY_AND_ASSIGN(ChromeNetLog); |
| 57 }; | 57 }; |
| 58 | 58 |
| 59 } // namespace net_log | 59 } // namespace net_log |
| 60 | 60 |
| 61 #endif // COMPONENTS_NET_LOG_CHROME_NET_LOG_H_ | 61 #endif // COMPONENTS_NET_LOG_CHROME_NET_LOG_H_ |
| OLD | NEW |