Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: chrome/browser/net/chrome_net_log_helper.cc

Issue 1347043002: Move ChromeNetLog to //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 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/chrome_net_log_helper.h ('k') | chrome/browser/net/net_log_temp_file.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/chrome_net_log_helper.cc
diff --git a/chrome/browser/net/chrome_net_log.cc b/chrome/browser/net/chrome_net_log_helper.cc
similarity index 25%
copy from chrome/browser/net/chrome_net_log.cc
copy to chrome/browser/net/chrome_net_log_helper.cc
index 373fc7f46e5d163955fa376b32377008549bd9d8..bd63d69c0a649dd08602c8739cb44c0f8cfe7d2e 100644
--- a/chrome/browser/net/chrome_net_log.cc
+++ b/chrome/browser/net/chrome_net_log_helper.cc
@@ -1,32 +1,18 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/net/chrome_net_log.h"
-
-#include <stdio.h>
+#include "chrome/browser/net/chrome_net_log_helper.h"
#include "base/command_line.h"
-#include "base/files/scoped_file.h"
#include "base/logging.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_util.h"
-#include "base/values.h"
-#include "chrome/browser/net/net_log_temp_file.h"
-#include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
#include "chrome/common/chrome_switches.h"
-#include "content/public/common/content_switches.h"
-#include "net/log/trace_net_log_observer.h"
-#include "net/log/write_to_file_net_log_observer.h"
-
-namespace {
-net::NetLogCaptureMode GetCaptureModeFromCommandLine(
+net::NetLogCaptureMode GetNetCaptureModeFromCommandLine(
const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kNetLogCaptureMode)) {
std::string capture_mode_string =
command_line.GetSwitchValueASCII(switches::kNetLogCaptureMode);
-
if (capture_mode_string == "Default")
return net::NetLogCaptureMode::Default();
if (capture_mode_string == "IncludeCookiesAndCredentials")
@@ -39,56 +25,3 @@ net::NetLogCaptureMode GetCaptureModeFromCommandLine(
return net::NetLogCaptureMode::Default();
}
-
-} // namespace
-
-ChromeNetLog::ChromeNetLog()
- : net_log_temp_file_(new NetLogTempFile(this)) {
- const base::CommandLine& command_line =
- *base::CommandLine::ForCurrentProcess();
-
- if (command_line.HasSwitch(switches::kLogNetLog)) {
- base::FilePath log_path =
- command_line.GetSwitchValuePath(switches::kLogNetLog);
- // Much like logging.h, bypass threading restrictions by using fopen
- // directly. Have to write on a thread that's shutdown to handle events on
- // shutdown properly, and posting events to another thread as they occur
- // would result in an unbounded buffer size, so not much can be gained by
- // doing this on another thread. It's only used when debugging Chrome, so
- // performance is not a big concern.
- base::ScopedFILE file;
-#if defined(OS_WIN)
- file.reset(_wfopen(log_path.value().c_str(), L"w"));
-#elif defined(OS_POSIX)
- file.reset(fopen(log_path.value().c_str(), "w"));
-#endif
-
- if (!file) {
- LOG(ERROR) << "Could not open file " << log_path.value()
- << " for net logging";
- } else {
- scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
- write_to_file_observer_.reset(new net::WriteToFileNetLogObserver());
-
- net::NetLogCaptureMode capture_mode =
- GetCaptureModeFromCommandLine(command_line);
- write_to_file_observer_->set_capture_mode(capture_mode);
-
- write_to_file_observer_->StartObserving(this, file.Pass(),
- constants.get(), nullptr);
- }
- }
-
- trace_net_log_observer_.reset(new net::TraceNetLogObserver());
- trace_net_log_observer_->WatchForTraceStart(this);
-}
-
-ChromeNetLog::~ChromeNetLog() {
- net_log_temp_file_.reset();
- // Remove the observers we own before we're destroyed.
- if (write_to_file_observer_)
- write_to_file_observer_->StopObserving(nullptr);
- if (trace_net_log_observer_)
- trace_net_log_observer_->StopWatchForTraceStart();
-}
-
« no previous file with comments | « chrome/browser/net/chrome_net_log_helper.h ('k') | chrome/browser/net/net_log_temp_file.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698