| Index: net/log/write_to_file_net_log_observer_unittest.cc
|
| diff --git a/net/log/net_log_logger_unittest.cc b/net/log/write_to_file_net_log_observer_unittest.cc
|
| similarity index 93%
|
| rename from net/log/net_log_logger_unittest.cc
|
| rename to net/log/write_to_file_net_log_observer_unittest.cc
|
| index 8a0d64a2866d963ab282e7729498c5129006cfb3..101b3d4138827d84356eef9ba16841e16352d891 100644
|
| --- a/net/log/net_log_logger_unittest.cc
|
| +++ b/net/log/write_to_file_net_log_observer_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "net/log/net_log_logger.h"
|
| +#include "net/log/write_to_file_net_log_observer.h"
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| @@ -39,7 +39,7 @@ TEST_F(NetLogLoggerTest, GeneratesValidJSONForNoEvents) {
|
| // Create and destroy a logger.
|
| base::ScopedFILE file(base::OpenFile(log_path_, "w"));
|
| ASSERT_TRUE(file);
|
| - scoped_ptr<NetLogLogger> logger(new NetLogLogger());
|
| + scoped_ptr<WriteToFileNetLogObserver> logger(new WriteToFileNetLogObserver());
|
| logger->StartObserving(&net_log_, file.Pass(), nullptr, nullptr);
|
| logger->StopObserving(nullptr);
|
| logger.reset();
|
| @@ -64,7 +64,7 @@ TEST_F(NetLogLoggerTest, GeneratesValidJSONForNoEvents) {
|
| TEST_F(NetLogLoggerTest, LogLevel) {
|
| base::ScopedFILE file(base::OpenFile(log_path_, "w"));
|
| ASSERT_TRUE(file);
|
| - NetLogLogger logger;
|
| + WriteToFileNetLogObserver logger;
|
| logger.StartObserving(&net_log_, file.Pass(), nullptr, nullptr);
|
| EXPECT_EQ(NetLog::LOG_STRIP_PRIVATE_DATA, logger.log_level());
|
| EXPECT_EQ(NetLog::LOG_STRIP_PRIVATE_DATA, net_log_.GetLogLevel());
|
| @@ -82,7 +82,7 @@ TEST_F(NetLogLoggerTest, LogLevel) {
|
| TEST_F(NetLogLoggerTest, GeneratesValidJSONWithOneEvent) {
|
| base::ScopedFILE file(base::OpenFile(log_path_, "w"));
|
| ASSERT_TRUE(file);
|
| - scoped_ptr<NetLogLogger> logger(new NetLogLogger());
|
| + scoped_ptr<WriteToFileNetLogObserver> logger(new WriteToFileNetLogObserver());
|
| logger->StartObserving(&net_log_, file.Pass(), nullptr, nullptr);
|
|
|
| const int kDummyId = 1;
|
| @@ -112,7 +112,7 @@ TEST_F(NetLogLoggerTest, GeneratesValidJSONWithOneEvent) {
|
| TEST_F(NetLogLoggerTest, GeneratesValidJSONWithMultipleEvents) {
|
| base::ScopedFILE file(base::OpenFile(log_path_, "w"));
|
| ASSERT_TRUE(file);
|
| - scoped_ptr<NetLogLogger> logger(new NetLogLogger());
|
| + scoped_ptr<WriteToFileNetLogObserver> logger(new WriteToFileNetLogObserver());
|
| logger->StartObserving(&net_log_, file.Pass(), nullptr, nullptr);
|
|
|
| const int kDummyId = 1;
|
| @@ -147,7 +147,7 @@ TEST_F(NetLogLoggerTest, CustomConstants) {
|
| scoped_ptr<base::Value> constants(new base::StringValue(kConstantString));
|
| base::ScopedFILE file(base::OpenFile(log_path_, "w"));
|
| ASSERT_TRUE(file);
|
| - scoped_ptr<NetLogLogger> logger(new NetLogLogger());
|
| + scoped_ptr<WriteToFileNetLogObserver> logger(new WriteToFileNetLogObserver());
|
| logger->StartObserving(&net_log_, file.Pass(), constants.get(), nullptr);
|
| logger->StopObserving(nullptr);
|
| logger.reset();
|
| @@ -175,7 +175,7 @@ TEST_F(NetLogLoggerTest, GeneratesValidJSONWithContext) {
|
| // Create and destroy a logger.
|
| base::ScopedFILE file(base::OpenFile(log_path_, "w"));
|
| ASSERT_TRUE(file);
|
| - scoped_ptr<NetLogLogger> logger(new NetLogLogger());
|
| + scoped_ptr<WriteToFileNetLogObserver> logger(new WriteToFileNetLogObserver());
|
| logger->StartObserving(&net_log_, file.Pass(), nullptr, &context);
|
| logger->StopObserving(&context);
|
| logger.reset();
|
| @@ -213,7 +213,7 @@ TEST_F(NetLogLoggerTest, GeneratesValidJSONWithContextWithActiveRequest) {
|
| // Create and destroy a logger.
|
| base::ScopedFILE file(base::OpenFile(log_path_, "w"));
|
| ASSERT_TRUE(file);
|
| - scoped_ptr<NetLogLogger> logger(new NetLogLogger());
|
| + scoped_ptr<WriteToFileNetLogObserver> logger(new WriteToFileNetLogObserver());
|
| logger->StartObserving(&net_log_, file.Pass(), nullptr, &context);
|
| logger->StopObserving(&context);
|
| logger.reset();
|
|
|