Refactor NetLog::LogLevel --> NetLogCaptureMode.

chrome/browser/ui/webui/net_internals/net_internals_ui.cc

 // Copyright (c) 2012 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_internals/net_internals_ui.h"
 
 #include <algorithm>
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 281 matching lines @@
   void OnEnableIPv6(const base::ListValue* list);
   void OnHSTSQuery(const base::ListValue* list);
   void OnHSTSAdd(const base::ListValue* list);
   void OnHSTSDelete(const base::ListValue* list);
   void OnGetSessionNetworkStats(const base::ListValue* list);
   void OnCloseIdleSockets(const base::ListValue* list);
   void OnFlushSocketPools(const base::ListValue* list);
 #if defined(OS_WIN)
   void OnGetServiceProviders(const base::ListValue* list);
 #endif
-  void OnSetLogLevel(const base::ListValue* list);
+  void OnSetCaptureMode(const base::ListValue* list);
 
   // ChromeNetLog::ThreadSafeObserver implementation:
   void OnAddEntry(const net::NetLog::Entry& entry) override;
 
   // Helper that calls g_browser.receive in the renderer, passing in |command|
   // and |arg|.  Takes ownership of |arg|.  If the renderer is displaying a log
   // file, the message will be ignored.  Note that this can be called from any
   // thread.
   void SendJavascriptCommand(const std::string& command, base::Value* arg);
 
@@ skipping 146 matching lines @@
       base::Bind(&IOThreadImpl::CallbackHelper,
                  &IOThreadImpl::OnFlushSocketPools, proxy_));
 #if defined(OS_WIN)
   web_ui()->RegisterMessageCallback(
       "getServiceProviders",
       base::Bind(&IOThreadImpl::CallbackHelper,
                  &IOThreadImpl::OnGetServiceProviders, proxy_));
 #endif
 
   web_ui()->RegisterMessageCallback(
-      "setLogLevel",
-      base::Bind(&IOThreadImpl::CallbackHelper,
-                 &IOThreadImpl::OnSetLogLevel, proxy_));
+      "setCaptureMode", base::Bind(&IOThreadImpl::CallbackHelper,
+                                   &IOThreadImpl::OnSetCaptureMode, proxy_));
   web_ui()->RegisterMessageCallback(
       "clearBrowserCache",
       base::Bind(&NetInternalsMessageHandler::OnClearBrowserCache,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "getPrerenderInfo",
       base::Bind(&NetInternalsMessageHandler::OnGetPrerenderInfo,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "getHistoricNetworkStats",
@@ skipping 194 matching lines @@
   if (net_log()) {
     net_log()->DeprecatedRemoveObserver(this);
     PostPendingEntries();
   }
 
   SendJavascriptCommand("receivedConstants", NetInternalsUI::GetConstants());
 
   PrePopulateEventList();
 
   // Register with network stack to observe events.
-  io_thread_->net_log()->DeprecatedAddObserver(this,
-      net::NetLog::LOG_ALL_BUT_BYTES);
+  io_thread_->net_log()->DeprecatedAddObserver(
+      this, net::NetLogCaptureMode::IncludeCookiesAndCredentials());
 }
 
 void NetInternalsMessageHandler::IOThreadImpl::OnGetNetInfo(
     const base::ListValue* list) {
   DCHECK(list);
   int info_sources;
   if (!list->GetInteger(0, &info_sources))
     return;
   SendNetInfo(info_sources);
 }
@@ skipping 365 matching lines @@
   std::string status;
   if (succeeded)
     status = "Debug mode is changed to " + subsystem;
   else
     status = "Failed to change debug mode to " + subsystem;
   SendJavascriptCommand("receivedSetNetworkDebugMode",
                         new base::StringValue(status));
 }
 #endif  // defined(OS_CHROMEOS)
 
-void NetInternalsMessageHandler::IOThreadImpl::OnSetLogLevel(
+void NetInternalsMessageHandler::IOThreadImpl::OnSetCaptureMode(
     const base::ListValue* list) {
-  int log_level;
-  std::string log_level_string;
-  if (!list->GetString(0, &log_level_string) ||
-      !base::StringToInt(log_level_string, &log_level)) {
+  std::string capture_mode_string;
+  if (!list->GetString(0, &capture_mode_string)) {
     NOTREACHED();
     return;
   }
 
-  DCHECK_GE(log_level, net::NetLog::LOG_ALL);
-  DCHECK_LT(log_level, net::NetLog::LOG_NONE);
-  net_log()->SetObserverLogLevel(
-      this, static_cast<net::NetLog::LogLevel>(log_level));
+  // Convert the string to a NetLogCaptureMode.
+  net::NetLogCaptureMode mode;
+  if (capture_mode_string == "IncludeSocketBytes") {
+    mode = net::NetLogCaptureMode::IncludeSocketBytes();
+  } else if (capture_mode_string == "IncludeCookiesAndCredentials") {
+    mode = net::NetLogCaptureMode::IncludeCookiesAndCredentials();
+  } else {
+    NOTREACHED();
+  }
+
+  net_log()->SetObserverCaptureMode(this, mode);
 }
 
 // Note that unlike other methods of IOThreadImpl, this function
 // can be called from ANY THREAD.
 void NetInternalsMessageHandler::IOThreadImpl::OnAddEntry(
     const net::NetLog::Entry& entry) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&IOThreadImpl::AddEntryToQueue, this, entry.ToValue()));
 }
@@ skipping 105 matching lines @@
 }
 
 NetInternalsUI::NetInternalsUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new NetInternalsMessageHandler());
 
   // Set up the chrome://net-internals/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateNetInternalsHTMLSource());
 }