Move ChromeNetLog to //components

components/net_log/chrome_net_log.cc

Index: components/net_log/chrome_net_log.cc
diff --git a/chrome/browser/net/chrome_net_log.cc b/components/net_log/chrome_net_log.cc
similarity index 41%
rename from chrome/browser/net/chrome_net_log.cc
rename to components/net_log/chrome_net_log.cc
index 373fc7f46e5d163955fa376b32377008549bd9d8..3422db0c5a33e2f42240ae0cfdc7a6430eb142f3 100644
--- a/chrome/browser/net/chrome_net_log.cc
+++ b/components/net_log/chrome_net_log.cc
@@ -2,54 +2,29 @@
 // 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 "components/net_log/chrome_net_log.h"
 
 #include <stdio.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 "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
+#include "components/net_log/net_log_temp_file.h"
+#include "components/net_log/net_log_temp_file.h"
+#include "components/version_info/version_info.h"
+#include "net/log/net_log_util.h"
 #include "net/log/trace_net_log_observer.h"
 #include "net/log/write_to_file_net_log_observer.h"
 
-namespace {
+namespace net_log {
 
-net::NetLogCaptureMode GetCaptureModeFromCommandLine(
-    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")
-      return net::NetLogCaptureMode::IncludeCookiesAndCredentials();
-    if (capture_mode_string == "IncludeSocketBytes")
-      return net::NetLogCaptureMode::IncludeSocketBytes();
-
-    LOG(ERROR) << "Unrecognized value for --" << switches::kNetLogCaptureMode;
-  }
-
-  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);
+ChromeNetLog::ChromeNetLog(const base::FilePath& log_file,
+                           net::NetLogCaptureMode log_file_mode,
+                           const std::string& channel_string)
+    : net_log_temp_file_(new NetLogTempFile(this, channel_string)) {
+  if (!log_file.empty()) {
     // 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
@@ -58,24 +33,22 @@ ChromeNetLog::ChromeNetLog()
     // performance is not a big concern.
     base::ScopedFILE file;
 #if defined(OS_WIN)
-    file.reset(_wfopen(log_path.value().c_str(), L"w"));
+    file.reset(_wfopen(log_file.value().c_str(), L"w"));
 #elif defined(OS_POSIX)
-    file.reset(fopen(log_path.value().c_str(), "w"));
+    file.reset(fopen(log_file.value().c_str(), "w"));
 #endif
 
     if (!file) {
-      LOG(ERROR) << "Could not open file " << log_path.value()
+      LOG(ERROR) << "Could not open file " << log_file.value()
                  << " for net logging";
     } else {
-      scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
+      scoped_ptr<base::Value> constants(GetConstants(channel_string));
       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_->set_capture_mode(log_file_mode);
 
       write_to_file_observer_->StartObserving(this, file.Pass(),
-                                      constants.get(), nullptr);
+                                              constants.get(), nullptr);
     }
   }
 
@@ -92,3 +65,35 @@ ChromeNetLog::~ChromeNetLog() {
     trace_net_log_observer_->StopWatchForTraceStart();
 }
 
+// static
+base::Value* ChromeNetLog::GetConstants(const std::string& channel_string) {
+  scoped_ptr<base::DictionaryValue> constants_dict = net::GetNetConstants();
+  DCHECK(constants_dict);
+
+  // Add a dictionary with the version of the client and its command line
+  // arguments.
+  {
+    base::DictionaryValue* dict = new base::DictionaryValue();
+
+    // We have everything we need to send the right values.
+    dict->SetString("name", version_info::GetProductName());
+    dict->SetString("version", version_info::GetVersionNumber());
+    dict->SetString("cl", version_info::GetLastChange());
+    dict->SetString("version_mod", channel_string);
+    dict->SetString("official", version_info::IsOfficialBuild() ? "official"
+                                                                : "unofficial");
+    dict->SetString("os_type", version_info::GetOSType());
+    dict->SetString(
+        "command_line",
+        base::CommandLine::ForCurrentProcess()->GetCommandLineString());

[eroman, 2015/09/16 20:52:21]

Same comment as earlier: Could you make this a parameter to the function? Maybe
this is inconsistent since the version information is not an input, so feel free
to argue this.

[droger, 2015/09/17 08:39:10]

I don't have a strong opinion. Done.

+
+    constants_dict->Set("clientInfo", dict);
+
+    data_reduction_proxy::DataReductionProxyEventStore::AddConstants(

[droger, 2015/09/17 08:39:10]

Note: this is the dependency on DataReductionProxyEventStore.

+        constants_dict.get());
+  }
+
+  return constants_dict.release();
+}
+
+}  // namespace net_log