| 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/log/write_to_file_net_log_observer.h" | 5 #include "net/log/write_to_file_net_log_observer.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| 11 #include "base/files/file_util.h" | 11 #include "base/files/file_util.h" |
| 12 #include "base/files/scoped_file.h" | 12 #include "base/files/scoped_file.h" |
| 13 #include "base/files/scoped_temp_dir.h" | 13 #include "base/files/scoped_temp_dir.h" |
| 14 #include "base/json/json_reader.h" | 14 #include "base/json/json_reader.h" |
| 15 #include "base/values.h" | 15 #include "base/values.h" |
| 16 #include "net/log/net_log.h" | 16 #include "net/log/net_log.h" |
| 17 #include "net/log/net_log_entry.h" | 17 #include "net/log/net_log_entry.h" |
| 18 #include "net/log/net_log_event_type.h" | 18 #include "net/log/net_log_event_type.h" |
| 19 #include "net/log/net_log_source.h" | 19 #include "net/log/net_log_source.h" |
| 20 #include "net/log/net_log_source_type.h" | 20 #include "net/log/net_log_source_type.h" |
| 21 #include "net/log/net_log_util.h" | 21 #include "net/log/net_log_util.h" |
| 22 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" |
| 22 #include "net/url_request/url_request.h" | 23 #include "net/url_request/url_request.h" |
| 23 #include "net/url_request/url_request_context.h" | 24 #include "net/url_request/url_request_context.h" |
| 24 #include "net/url_request/url_request_test_util.h" | 25 #include "net/url_request/url_request_test_util.h" |
| 25 #include "testing/gtest/include/gtest/gtest.h" | 26 #include "testing/gtest/include/gtest/gtest.h" |
| 26 | 27 |
| 27 namespace net { | 28 namespace net { |
| 28 | 29 |
| 29 namespace { | 30 namespace { |
| 30 | 31 |
| 31 class WriteToFileNetLogObserverTest : public testing::Test { | 32 class WriteToFileNetLogObserverTest : public testing::Test { |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 | 211 |
| 211 TEST_F(WriteToFileNetLogObserverTest, | 212 TEST_F(WriteToFileNetLogObserverTest, |
| 212 GeneratesValidJSONWithContextWithActiveRequest) { | 213 GeneratesValidJSONWithContextWithActiveRequest) { |
| 213 // Create context, start a request. | 214 // Create context, start a request. |
| 214 TestURLRequestContext context(true); | 215 TestURLRequestContext context(true); |
| 215 context.set_net_log(&net_log_); | 216 context.set_net_log(&net_log_); |
| 216 context.Init(); | 217 context.Init(); |
| 217 TestDelegate delegate; | 218 TestDelegate delegate; |
| 218 | 219 |
| 219 // URL doesn't matter. Requests can't fail synchronously. | 220 // URL doesn't matter. Requests can't fail synchronously. |
| 220 std::unique_ptr<URLRequest> request( | 221 std::unique_ptr<URLRequest> request(context.CreateRequest( |
| 221 context.CreateRequest(GURL("blah:blah"), IDLE, &delegate)); | 222 GURL("blah:blah"), IDLE, &delegate, TRAFFIC_ANNOTATION_FOR_TESTS)); |
| 222 request->Start(); | 223 request->Start(); |
| 223 | 224 |
| 224 // Create and destroy a logger. | 225 // Create and destroy a logger. |
| 225 base::ScopedFILE file(base::OpenFile(log_path_, "w")); | 226 base::ScopedFILE file(base::OpenFile(log_path_, "w")); |
| 226 ASSERT_TRUE(file); | 227 ASSERT_TRUE(file); |
| 227 std::unique_ptr<WriteToFileNetLogObserver> logger( | 228 std::unique_ptr<WriteToFileNetLogObserver> logger( |
| 228 new WriteToFileNetLogObserver()); | 229 new WriteToFileNetLogObserver()); |
| 229 logger->StartObserving(&net_log_, std::move(file), nullptr, &context); | 230 logger->StartObserving(&net_log_, std::move(file), nullptr, &context); |
| 230 logger->StopObserving(&context); | 231 logger->StopObserving(&context); |
| 231 logger.reset(); | 232 logger.reset(); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 244 ASSERT_EQ(1u, events->GetSize()); | 245 ASSERT_EQ(1u, events->GetSize()); |
| 245 | 246 |
| 246 // Make sure additional information is present, but don't validate it. | 247 // Make sure additional information is present, but don't validate it. |
| 247 base::DictionaryValue* tab_info; | 248 base::DictionaryValue* tab_info; |
| 248 ASSERT_TRUE(dict->GetDictionary("tabInfo", &tab_info)); | 249 ASSERT_TRUE(dict->GetDictionary("tabInfo", &tab_info)); |
| 249 } | 250 } |
| 250 | 251 |
| 251 } // namespace | 252 } // namespace |
| 252 | 253 |
| 253 } // namespace net | 254 } // namespace net |
| OLD | NEW |