DevTools: introduce bound object on the agent side.

webkit/glue/webframeloaderclient_impl.cc

Index: webkit/glue/webframeloaderclient_impl.cc
===================================================================
--- webkit/glue/webframeloaderclient_impl.cc	(revision 16977)
+++ webkit/glue/webframeloaderclient_impl.cc	(working copy)
@@ -46,7 +46,6 @@
 #endif
 #include "webkit/glue/autofill_form.h"
 #include "webkit/glue/alt_404_page_resource_fetcher.h"
-#include "webkit/glue/devtools/net_agent_impl.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/plugins/plugin_list.h"
@@ -181,10 +180,6 @@
     WebRequestImpl webreq(request);
     d->AssignIdentifierToRequest(webview, identifier, webreq);
   }
-  NetAgentImpl* net_agent = GetNetAgentImpl();
-  if (net_agent) {
-    net_agent->AssignIdentifierToRequest(loader, identifier, request);
-  }
 }
 
 // Determines whether the request being loaded by |loader| is a frame or a
@@ -233,10 +228,6 @@
     d->WillSendRequest(webview, identifier, &webreq);
     request = webreq.resource_request();
   }
-  NetAgentImpl* net_agent = GetNetAgentImpl();
-  if (net_agent) {
-    net_agent->WillSendRequest(loader, identifier, request);
-  }
 
   request.setAppCacheContextID(
               webframe_->GetAppCacheContext()->GetContextID());
@@ -304,21 +295,12 @@
 
   // Cancel any pending loads.
   alt_404_page_fetcher_.reset(NULL);
-
-  NetAgentImpl* net_agent = GetNetAgentImpl();
-  if (net_agent) {
-    net_agent->DidReceiveResponse(loader, identifier, response);
-  }
 }
 
 void WebFrameLoaderClient::dispatchDidReceiveContentLength(
     DocumentLoader* loader,
     unsigned long identifier,
     int length_received) {
-  NetAgentImpl* net_agent = GetNetAgentImpl();
-  if (net_agent) {
-    net_agent->DidReceiveContentLength(loader, identifier, length_received);
-  }
 }
 
 // Called when a particular resource load completes
@@ -338,11 +320,6 @@
   WebViewDelegate* d = webview->delegate();
   if (d)
     d->DidFinishLoading(webview, identifier);
-
-  NetAgentImpl* net_agent = GetNetAgentImpl();
-  if (net_agent) {
-    net_agent->DidFinishLoading(loader, identifier);
-  }
 }
 
 GURL WebFrameLoaderClient::GetAlt404PageUrl(DocumentLoader* loader) {
@@ -384,10 +361,6 @@
     webview->delegate()->DidFailLoadingWithError(webview, identifier,
                                                  WebErrorImpl(error));
   }
-  NetAgentImpl* net_agent = GetNetAgentImpl();
-  if (net_agent) {
-    net_agent->DidFailLoading(loader, identifier, error);
-  }
 }
 
 void WebFrameLoaderClient::dispatchDidFinishDocumentLoad() {
@@ -451,26 +424,12 @@
     result = d->DidLoadResourceFromMemoryCache(webview, webreq, webresp,
                                                webframe_);
   }
-  NetAgentImpl* net_agent = GetNetAgentImpl();
-  if (net_agent) {
-    net_agent->DidLoadResourceFromMemoryCache(
-        loader,
-        request,
-        response,
-        length);
-  }
   return result;
 }
 
 void WebFrameLoaderClient::dispatchDidLoadResourceByXMLHttpRequest(
     unsigned long identifier,
     const ScriptString& source) {
-  NetAgentImpl* net_agent = GetNetAgentImpl();
-  if (net_agent) {
-    net_agent->DidLoadResourceByXMLHttpRequest(
-        identifier,
-        source);
-  }
 }
 
 void WebFrameLoaderClient::dispatchDidHandleOnloadEvents() {
@@ -1643,16 +1602,3 @@
   if (d)
     d->NavigateBackForwardSoon(offset);
 }
-
-NetAgentImpl* WebFrameLoaderClient::GetNetAgentImpl() {
-  WebViewImpl* web_view = webframe_->GetWebViewImpl();
-  if (!web_view) {
-    return NULL;
-  }
-  WebDevToolsAgentImpl* tools_agent = web_view->GetWebDevToolsAgentImpl();
-  if (tools_agent) {
-    return tools_agent->net_agent_impl();
-  } else {
-    return NULL;
-  }
-}