Move DevToolsNetLogObserver to c/b/loader and create stub of network service interface

content/browser/loader/netlog_observer.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 "content/browser/devtools/devtools_netlog_observer.h"
+#include "content/browser/loader/netlog_observer.h"
 
 #include <stddef.h>
 
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/spdy/spdy_header_block.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_netlog_params.h"
 
 namespace content {
 const size_t kMaxNumEntries = 1000;
 
-DevToolsNetLogObserver* DevToolsNetLogObserver::instance_ = NULL;
+NetLogObserver* NetLogObserver::instance_ = NULL;
 
-DevToolsNetLogObserver::DevToolsNetLogObserver() {
-}
+NetLogObserver::NetLogObserver() {}
 
-DevToolsNetLogObserver::~DevToolsNetLogObserver() {
-}
+NetLogObserver::~NetLogObserver() {}
 
-DevToolsNetLogObserver::ResourceInfo* DevToolsNetLogObserver::GetResourceInfo(
-    uint32_t id) {
+NetLogObserver::ResourceInfo* NetLogObserver::GetResourceInfo(uint32_t id) {
   RequestToInfoMap::iterator it = request_to_info_.find(id);
   if (it != request_to_info_.end())
     return it->second.get();
   return NULL;
 }
 
-void DevToolsNetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) {
+void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) {
   // The events that the Observer is interested in only occur on the IO thread.
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO))
     return;
 
   if (entry.source().type == net::NetLog::SOURCE_URL_REQUEST)
     OnAddURLRequestEntry(entry);
 }
 
-void DevToolsNetLogObserver::OnAddURLRequestEntry(
-    const net::NetLog::Entry& entry) {
+void NetLogObserver::OnAddURLRequestEntry(const net::NetLog::Entry& entry) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   bool is_begin = entry.phase() == net::NetLog::PHASE_BEGIN;
   bool is_end = entry.phase() == net::NetLog::PHASE_END;
 
   if (entry.type() == net::NetLog::TYPE_URL_REQUEST_START_JOB) {
     if (is_begin) {
       if (request_to_info_.size() > kMaxNumEntries) {
         LOG(WARNING) << "The raw headers observer url request count has grown "
                         "larger than expected, resetting";
@@ skipping 13 matching lines @@
   ResourceInfo* info = GetResourceInfo(entry.source().id);
   if (!info)
     return;
 
   switch (entry.type()) {
     case net::NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST_HEADERS: {
       std::unique_ptr<base::Value> event_params(entry.ParametersToValue());
       std::string request_line;
       net::HttpRequestHeaders request_headers;
 
-      if (!net::HttpRequestHeaders::FromNetLogParam(event_params.get(),
-                                                    &request_headers,
-                                                    &request_line)) {
+      if (!net::HttpRequestHeaders::FromNetLogParam(
+              event_params.get(), &request_headers, &request_line)) {
         NOTREACHED();
       }
 
       // We need to clear headers in case the same url_request is reused for
       // several http requests (e.g. see http://crbug.com/80157).
       info->request_headers.clear();
 
       for (net::HttpRequestHeaders::Iterator it(request_headers);
            it.GetNext();) {
         info->request_headers.push_back(std::make_pair(it.name(), it.value()));
@@ skipping 53 matching lines @@
         // SPDY request.
         info->response_headers_text = "";
       }
       break;
     }
     default:
       break;
   }
 }
 
-void DevToolsNetLogObserver::Attach() {
+void NetLogObserver::Attach() {
   DCHECK(!instance_);
   net::NetLog* net_log = GetContentClient()->browser()->GetNetLog();
   if (net_log) {
-    instance_ = new DevToolsNetLogObserver();
+    instance_ = new NetLogObserver();
     net_log->DeprecatedAddObserver(
         instance_, net::NetLogCaptureMode::IncludeCookiesAndCredentials());
   }
 }
 
-void DevToolsNetLogObserver::Detach() {
+void NetLogObserver::Detach() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (instance_) {
     // Safest not to do this in the destructor to maintain thread safety across
     // refactorings.
     instance_->net_log()->DeprecatedRemoveObserver(instance_);
     delete instance_;
     instance_ = NULL;
   }
 }
 
-DevToolsNetLogObserver* DevToolsNetLogObserver::GetInstance() {
+NetLogObserver* NetLogObserver::GetInstance() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   return instance_;
 }
 
 // static
-void DevToolsNetLogObserver::PopulateResponseInfo(
-    net::URLRequest* request,
-    ResourceResponse* response) {
+void NetLogObserver::PopulateResponseInfo(net::URLRequest* request,
+                                          ResourceResponse* response) {
   const ResourceRequestInfoImpl* request_info =
       ResourceRequestInfoImpl::ForRequest(request);
   if (!request_info || !request_info->ShouldReportRawHeaders())
     return;
 
   uint32_t source_id = request->net_log().source().id;
-  DevToolsNetLogObserver* dev_tools_net_log_observer =
-      DevToolsNetLogObserver::GetInstance();
+  NetLogObserver* dev_tools_net_log_observer = NetLogObserver::GetInstance();
   if (dev_tools_net_log_observer == NULL)
     return;
   response->head.devtools_info =
       dev_tools_net_log_observer->GetResourceInfo(source_id);
 }
 
 }  // namespace content