DevTools: Revert 19813 since it creates more problems than solves.

TBR=yurys


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19823 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 12 deletions

diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc
index 6652ba4..cabcdd7 100644
--- a/webkit/glue/webdevtoolsagent_impl.cc
+++ b/webkit/glue/webdevtoolsagent_impl.cc
@@ -136,17 +136,8 @@ void WebDevToolsAgentImpl::SetMainFrameDocumentReady(bool ready) {
     doc = NULL;
   }
   if (doc) {
-    // Do not clear utility context when document is being cleared -
-    // there still can be pending messages from the client that require
-    // context to be processed.
     debugger_agent_impl_->ResetUtilityContext(doc, &utility_context_);
     InitDevToolsAgentHost();
-    if (!report_frame_navigate_url_.empty()) {
-      // This is a document from the first load, issue frame navigate
-      // scheduled in DidCommitLoadForFrame.
-      tools_agent_delegate_stub_->FrameNavigate(report_frame_navigate_url_);
-      report_frame_navigate_url_ = "";
-    }
   }
   dom_agent_impl_->SetDocument(doc);
 }
@@ -165,8 +156,8 @@ void WebDevToolsAgentImpl::DidCommitLoadForFrame(
       ds->unreachableURL() :
       request.url();
   if (webview->GetMainFrame() == frame) {
-    // Schedule frame navigate event.
-    report_frame_navigate_url_ = url.possibly_invalid_spec();
+    tools_agent_delegate_stub_->FrameNavigate(
+        url.possibly_invalid_spec());
   }
   InspectorController* ic = webview->page()->inspectorController();
   // Unhide resources panel if necessary.
diff --git a/webkit/glue/webdevtoolsagent_impl.h b/webkit/glue/webdevtoolsagent_impl.h
index 2c5d86f..64fd205 100644
--- a/webkit/glue/webdevtoolsagent_impl.h
+++ b/webkit/glue/webdevtoolsagent_impl.h
@@ -101,7 +101,6 @@ class WebDevToolsAgentImpl
   // for matching rules.
   v8::Persistent<v8::Context> utility_context_;
   OwnPtr<BoundObject> devtools_agent_host_;
-  std::string report_frame_navigate_url_;
   DISALLOW_COPY_AND_ASSIGN(WebDevToolsAgentImpl);
 };