Move ChromeNetLog to //components

chrome/browser/ui/webui/net_export_ui.cc

 // Copyright (c) 2013 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/ui/webui/net_export_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/net/chrome_net_log.h"
-#include "chrome/browser/net/net_log_temp_file.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
+#include "components/net_log/chrome_net_log.h"
+#include "components/net_log/net_log_temp_file.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/intent_helper.h"
@@ skipping 32 matching lines @@
   // Messages.
   void OnGetExportNetLogInfo(const base::ListValue* list);
   void OnStartNetLog(const base::ListValue* list);
   void OnStopNetLog(const base::ListValue* list);
   void OnSendNetLog(const base::ListValue* list);
 
  private:
   // Calls NetLogTempFile's ProcessCommand with DO_START and DO_STOP commands.
   static void ProcessNetLogCommand(
       base::WeakPtr<NetExportMessageHandler> net_export_message_handler,
-      NetLogTempFile* net_log_temp_file,
-      NetLogTempFile::Command command);
+      net_log::NetLogTempFile* net_log_temp_file,

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

Observation: the distinction of the "net_log" namespace isn't entirely clear, in
that this is also a common name in the src/net/log directory. I don't have a
better suggestion though; this is still probably a good name for it.

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

I need to componentize some code from net-export as well, and this code (in
particular the temp file log) is mainly/only used for net-export/net-internals
UI. There are no plans to componentize NetInternalsUI for now.

What about something like net_export::? Or net_debug::?

Otherwise I can suggest net_logging::, which is a bit more different from
net/log.

+      net_log::NetLogTempFile::Command command);
 
   // Returns the path to the file which has NetLog data.
-  static base::FilePath GetNetLogFileName(NetLogTempFile* net_log_temp_file);
+  static base::FilePath GetNetLogFileName(
+      net_log::NetLogTempFile* net_log_temp_file);
 
   // Send state/file information from NetLogTempFile.
   static void SendExportNetLogInfo(
       base::WeakPtr<NetExportMessageHandler> net_export_message_handler,
-      NetLogTempFile* net_log_temp_file);
+      net_log::NetLogTempFile* net_log_temp_file);
 
   // Send NetLog data via email. This runs on UI thread.
   static void SendEmail(const base::FilePath& file_to_send);
 
   // Call NetExportView.onExportNetLogInfoChanged JavsScript function in the
   // renderer, passing in |arg|. Takes ownership of |arg|.
   void OnExportNetLogInfoChanged(base::Value* arg);
 
   // Cache of g_browser_process->net_log()->net_log_temp_file().
-  NetLogTempFile* net_log_temp_file_;
+  net_log::NetLogTempFile* net_log_temp_file_;
 
   base::WeakPtrFactory<NetExportMessageHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NetExportMessageHandler);
 };
 
 NetExportMessageHandler::NetExportMessageHandler()
     : net_log_temp_file_(g_browser_process->net_log()->net_log_temp_file()),
       weak_ptr_factory_(this) {
 }
 
 NetExportMessageHandler::~NetExportMessageHandler() {
   // Cancel any in-progress requests to collect net_log into temporary file.
-  BrowserThread::PostTask(
-      BrowserThread::FILE_USER_BLOCKING,
-      FROM_HERE,
-      base::Bind(&NetLogTempFile::ProcessCommand,
-                 base::Unretained(net_log_temp_file_),
-                 NetLogTempFile::DO_STOP));
+  BrowserThread::PostTask(BrowserThread::FILE_USER_BLOCKING, FROM_HERE,
+                          base::Bind(&net_log::NetLogTempFile::ProcessCommand,
+                                     base::Unretained(net_log_temp_file_),
+                                     net_log::NetLogTempFile::DO_STOP));
 }
 
 void NetExportMessageHandler::RegisterMessages() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   web_ui()->RegisterMessageCallback(
       "getExportNetLogInfo",
       base::Bind(&NetExportMessageHandler::OnGetExportNetLogInfo,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
@@ skipping 18 matching lines @@
       base::Bind(&NetExportMessageHandler::SendExportNetLogInfo,
                  weak_ptr_factory_.GetWeakPtr(),
                  net_log_temp_file_));
 }
 
 void NetExportMessageHandler::OnStartNetLog(const base::ListValue* list) {
   std::string log_mode;
   bool result = list->GetString(0, &log_mode);
   DCHECK(result);
 
-  NetLogTempFile::Command command;
+  net_log::NetLogTempFile::Command command;
   if (log_mode == "LOG_BYTES") {
-    command = NetLogTempFile::DO_START_LOG_BYTES;
+    command = net_log::NetLogTempFile::DO_START_LOG_BYTES;
   } else if (log_mode == "NORMAL") {
-    command = NetLogTempFile::DO_START;
+    command = net_log::NetLogTempFile::DO_START;
   } else {
     DCHECK_EQ("STRIP_PRIVATE_DATA", log_mode);
-    command = NetLogTempFile::DO_START_STRIP_PRIVATE_DATA;
+    command = net_log::NetLogTempFile::DO_START_STRIP_PRIVATE_DATA;
   }
 
   ProcessNetLogCommand(weak_ptr_factory_.GetWeakPtr(), net_log_temp_file_,
                        command);
 }
 
 void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {
-  ProcessNetLogCommand(weak_ptr_factory_.GetWeakPtr(),
-                       net_log_temp_file_,
-                       NetLogTempFile::DO_STOP);
+  ProcessNetLogCommand(weak_ptr_factory_.GetWeakPtr(), net_log_temp_file_,
+                       net_log::NetLogTempFile::DO_STOP);
 }
 
 void NetExportMessageHandler::OnSendNetLog(const base::ListValue* list) {
   content::BrowserThread::PostTaskAndReplyWithResult(
     content::BrowserThread::FILE_USER_BLOCKING,
         FROM_HERE,
         base::Bind(&NetExportMessageHandler::GetNetLogFileName,
                    base::Unretained(net_log_temp_file_)),
         base::Bind(&NetExportMessageHandler::SendEmail));
 }
 
 // static
 void NetExportMessageHandler::ProcessNetLogCommand(
     base::WeakPtr<NetExportMessageHandler> net_export_message_handler,
-    NetLogTempFile* net_log_temp_file,
-    NetLogTempFile::Command command) {
+    net_log::NetLogTempFile* net_log_temp_file,
+    net_log::NetLogTempFile::Command command) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::FILE_USER_BLOCKING)) {
     BrowserThread::PostTask(
         BrowserThread::FILE_USER_BLOCKING,
         FROM_HERE,
         base::Bind(&NetExportMessageHandler::ProcessNetLogCommand,
                    net_export_message_handler,
                    net_log_temp_file,
                    command));
     return;
   }
 
   DCHECK_CURRENTLY_ON(BrowserThread::FILE_USER_BLOCKING);
   net_log_temp_file->ProcessCommand(command);
   SendExportNetLogInfo(net_export_message_handler, net_log_temp_file);
 }
 
 // static
 base::FilePath NetExportMessageHandler::GetNetLogFileName(
-    NetLogTempFile* net_log_temp_file) {
+    net_log::NetLogTempFile* net_log_temp_file) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE_USER_BLOCKING);
   base::FilePath net_export_file_path;
   net_log_temp_file->GetFilePath(&net_export_file_path);
   return net_export_file_path;
 }
 
 // static
 void NetExportMessageHandler::SendExportNetLogInfo(
     base::WeakPtr<NetExportMessageHandler> net_export_message_handler,
-    NetLogTempFile* net_log_temp_file) {
+    net_log::NetLogTempFile* net_log_temp_file) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE_USER_BLOCKING);
   base::Value* value = net_log_temp_file->GetState();
   if (!BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&NetExportMessageHandler::OnExportNetLogInfoChanged,
                  net_export_message_handler,
                  value))) {
     // Failed posting the task, avoid leaking.
     delete value;
   }
@@ skipping 28 matching lines @@
 
 }  // namespace
 
 NetExportUI::NetExportUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new NetExportMessageHandler());
 
   // Set up the chrome://net-export/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateNetExportHTMLSource());
 }