diff options
Diffstat (limited to 'chrome/browser/extensions')
4 files changed, 23 insertions, 23 deletions
diff --git a/chrome/browser/extensions/api/dial/dial_service_unittest.cc b/chrome/browser/extensions/api/dial/dial_service_unittest.cc index 107a43f..5a5ab1a 100644 --- a/chrome/browser/extensions/api/dial/dial_service_unittest.cc +++ b/chrome/browser/extensions/api/dial/dial_service_unittest.cc @@ -8,7 +8,7 @@ #include "chrome/browser/extensions/api/dial/dial_device_data.h" #include "chrome/browser/extensions/api/dial/dial_service.h" #include "net/base/ip_endpoint.h" -#include "net/log/capturing_net_log.h" +#include "net/log/test_net_log.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -43,13 +43,13 @@ class MockObserver : public DialService::Observer { class DialServiceTest : public testing::Test { public: DialServiceTest() - : dial_service_(&capturing_net_log_) { + : dial_service_(&test_net_log_) { CHECK(net::ParseIPLiteralToNumber("0.0.0.0", &mock_ip_)); dial_service_.AddObserver(&mock_observer_); dial_socket_ = dial_service_.CreateDialSocket(); } protected: - net::CapturingNetLog capturing_net_log_; + net::TestNetLog test_net_log_; net::IPAddressNumber mock_ip_; DialServiceImpl dial_service_; scoped_ptr<DialServiceImpl::DialSocket> dial_socket_; diff --git a/chrome/browser/extensions/api/log_private/log_private_api.h b/chrome/browser/extensions/api/log_private/log_private_api.h index efc1889..77e8c03 100644 --- a/chrome/browser/extensions/api/log_private/log_private_api.h +++ b/chrome/browser/extensions/api/log_private/log_private_api.h @@ -20,7 +20,7 @@ #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_registry_observer.h" #include "net/log/net_log.h" -#include "net/log/net_log_logger.h" +#include "net/log/write_to_file_net_log_observer.h" class IOThread; @@ -113,7 +113,7 @@ class LogPrivateAPI : public BrowserContextKeyedAPI, api::log_private::EventSink event_sink_; std::set<std::string> net_internal_watches_; scoped_ptr<base::ListValue> pending_entries_; - scoped_ptr<net::NetLogLogger> net_log_logger_; + scoped_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_; // Listen to extension unloaded notifications. ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> extension_registry_observer_; diff --git a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc index 582fe12..e53007b 100644 --- a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc +++ b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc @@ -287,10 +287,10 @@ void LogPrivateAPI::StartObservingNetEvents( if (!file->get()) return; - net_log_logger_.reset(new net::NetLogLogger()); - net_log_logger_->set_log_level(net::NetLog::LOG_ALL_BUT_BYTES); - net_log_logger_->StartObserving(io_thread->net_log(), file->Pass(), nullptr, - nullptr); + write_to_file_observer_.reset(new net::WriteToFileNetLogObserver()); + write_to_file_observer_->set_log_level(net::NetLog::LOG_ALL_BUT_BYTES); + write_to_file_observer_->StartObserving(io_thread->net_log(), file->Pass(), + nullptr, nullptr); } void LogPrivateAPI::MaybeStartNetInternalLogging( @@ -359,8 +359,8 @@ void LogPrivateAPI::StopNetInternalLogging() { net_log()->DeprecatedRemoveObserver(this); break; case api::log_private::EVENT_SINK_FILE: - net_log_logger_->StopObserving(nullptr); - net_log_logger_.reset(); + write_to_file_observer_->StopObserving(nullptr); + write_to_file_observer_.reset(); break; case api::log_private::EVENT_SINK_NONE: NOTREACHED(); diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index ffaf046..f4e2313 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -45,7 +45,7 @@ #include "net/base/upload_bytes_element_reader.h" #include "net/base/upload_file_element_reader.h" #include "net/dns/mock_host_resolver.h" -#include "net/log/capturing_net_log.h" +#include "net/log/test_net_log.h" #include "net/url_request/url_request_job_factory_impl.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest-message.h" @@ -1321,7 +1321,7 @@ TEST(ExtensionWebRequestHelpersTest, TestCalculateOnAuthRequiredDelta) { TEST(ExtensionWebRequestHelpersTest, TestMergeCancelOfResponses) { EventResponseDeltas deltas; - net::CapturingBoundNetLog capturing_net_log; + net::BoundTestNetLog capturing_net_log; net::BoundNetLog net_log = capturing_net_log.bound(); bool canceled = false; @@ -1347,7 +1347,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeCancelOfResponses) { TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses) { EventResponseDeltas deltas; - net::CapturingBoundNetLog capturing_net_log; + net::BoundTestNetLog capturing_net_log; net::BoundNetLog net_log = capturing_net_log.bound(); WarningSet warning_set; GURL effective_new_url; @@ -1428,7 +1428,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses) { // a kind of cancelling requests. TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses2) { EventResponseDeltas deltas; - net::CapturingBoundNetLog capturing_net_log; + net::BoundTestNetLog capturing_net_log; net::BoundNetLog net_log = capturing_net_log.bound(); WarningSet warning_set; GURL effective_new_url; @@ -1497,7 +1497,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses2) { // a kind of cancelling requests. TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeRequestResponses3) { EventResponseDeltas deltas; - net::CapturingBoundNetLog capturing_net_log; + net::BoundTestNetLog capturing_net_log; net::BoundNetLog net_log = capturing_net_log.bound(); WarningSet warning_set; GURL effective_new_url; @@ -1533,7 +1533,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnBeforeSendHeadersResponses) { net::HttpRequestHeaders base_headers; base_headers.AddHeaderFromString("key1: value 1"); base_headers.AddHeaderFromString("key2: value 2"); - net::CapturingBoundNetLog capturing_net_log; + net::BoundTestNetLog capturing_net_log; net::BoundNetLog net_log = capturing_net_log.bound(); WarningSet warning_set; std::string header_value; @@ -1629,7 +1629,7 @@ TEST(ExtensionWebRequestHelpersTest, net::HttpRequestHeaders base_headers; base_headers.AddHeaderFromString( "Cookie: name=value; name2=value2; name3=\"value3\""); - net::CapturingBoundNetLog capturing_net_log; + net::BoundTestNetLog capturing_net_log; net::BoundNetLog net_log = capturing_net_log.bound(); WarningSet warning_set; std::string header_value; @@ -1713,7 +1713,7 @@ std::string GetCookieExpirationDate(int delta_secs) { TEST(ExtensionWebRequestHelpersTest, TestMergeCookiesInOnHeadersReceivedResponses) { - net::CapturingBoundNetLog capturing_net_log; + net::BoundTestNetLog capturing_net_log; net::BoundNetLog net_log = capturing_net_log.bound(); WarningSet warning_set; std::string header_value; @@ -1948,7 +1948,7 @@ TEST(ExtensionWebRequestHelpersTest, } TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponses) { - net::CapturingBoundNetLog capturing_net_log; + net::BoundTestNetLog capturing_net_log; net::BoundNetLog net_log = capturing_net_log.bound(); WarningSet warning_set; std::string header_value; @@ -2048,7 +2048,7 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponses) { // Check that we do not delete too much TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponsesDeletion) { - net::CapturingBoundNetLog capturing_net_log; + net::BoundTestNetLog capturing_net_log; net::BoundNetLog net_log = capturing_net_log.bound(); WarningSet warning_set; std::string header_value; @@ -2102,7 +2102,7 @@ TEST(ExtensionWebRequestHelpersTest, TEST(ExtensionWebRequestHelpersTest, TestMergeOnHeadersReceivedResponsesRedirect) { EventResponseDeltas deltas; - net::CapturingBoundNetLog capturing_net_log; + net::BoundTestNetLog capturing_net_log; net::BoundNetLog net_log = capturing_net_log.bound(); WarningSet warning_set; @@ -2155,7 +2155,7 @@ TEST(ExtensionWebRequestHelpersTest, } TEST(ExtensionWebRequestHelpersTest, TestMergeOnAuthRequiredResponses) { - net::CapturingBoundNetLog capturing_net_log; + net::BoundTestNetLog capturing_net_log; net::BoundNetLog net_log = capturing_net_log.bound(); WarningSet warning_set; EventResponseDeltas deltas; |