chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc - Issue 976483002: Add ability for NetLogLogger to gather data from more than just NetLog

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

Issue 976483002: Add ability for NetLogLogger to gather data from more than just NetLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix comments Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/net/net_log_temp_file.cc ('k') | components/cronet/android/cronet_url_request_context_adapter.cc » ('j') | net/base/net_log_logger.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

index 4a317285b19bfff7e1b7910b28489036b18a33fa..88ee2978acbac46e6d50a0a5d17225ec6982448a 100644

--- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

@@ -9,6 +9,7 @@

#include "base/command_line.h"

#include "base/files/file_path.h"

#include "base/files/file_util.h"

+#include "base/files/scoped_file.h"

#include "base/prefs/pref_service.h"

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

@@ -277,13 +278,14 @@ void NetInternalsTest::MessageHandler::GetNetLogLoggerLog(

base::FilePath temp_file;

ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_directory.path(),

&temp_file));

- FILE* temp_file_handle = base::OpenFile(temp_file, "w");

+ base::ScopedFILE temp_file_handle(base::OpenFile(temp_file, "w"));

ASSERT_TRUE(temp_file_handle);

scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());

- scoped_ptr<net::NetLogLogger> net_log_logger(new net::NetLogLogger(

- temp_file_handle, *constants));

- net_log_logger->StartObserving(g_browser_process->net_log());

+ scoped_ptr<net::NetLogLogger> net_log_logger(new net::NetLogLogger());

+ net_log_logger->StartObserving(

+ g_browser_process->net_log(), temp_file_handle.Pass(), constants.get(),

+ nullptr);

g_browser_process->net_log()->AddGlobalEntry(

net::NetLog::TYPE_NETWORK_IP_ADDRESSES_CHANGED);

net::BoundNetLog bound_net_log = net::BoundNetLog::Make(

« no previous file with comments | « chrome/browser/net/net_log_temp_file.cc ('k') | components/cronet/android/cronet_url_request_context_adapter.cc » ('j') | net/base/net_log_logger.h » ('J')