Code Refactor and making function static in frame_navigation_state.

chrome/browser/extensions/api/web_navigation/web_navigation_api.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.
 
 // Implements the Chrome Extensions WebNavigation API.
 
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 104 matching lines @@
     content::WebContents* new_contents,
     int index) {
   WebNavigationTabObserver* tab_observer =
       WebNavigationTabObserver::Get(old_contents);
   if (!tab_observer) {
     // If you hit this DCHECK(), please add reproduction steps to
     // http://crbug.com/109464.
     DCHECK(GetViewType(old_contents) != VIEW_TYPE_TAB_CONTENTS);
     return;
   }
-  const FrameNavigationState& frame_navigation_state =
-      tab_observer->frame_navigation_state();
-
-  if (!frame_navigation_state.IsValidUrl(old_contents->GetURL()) ||
-      !frame_navigation_state.IsValidUrl(new_contents->GetURL()))
+  if (!FrameNavigationState::IsValidUrl(old_contents->GetURL()) ||
+      !FrameNavigationState::IsValidUrl(new_contents->GetURL()))
     return;
 
   helpers::DispatchOnTabReplaced(old_contents, profile_, new_contents);
 }
 
 void WebNavigationEventRouter::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
@@ skipping 109 matching lines @@
 WebNavigationTabObserver* WebNavigationTabObserver::Get(
     content::WebContents* web_contents) {
   TabObserverMap::iterator i = g_tab_observer.Get().find(web_contents);
   return i == g_tab_observer.Get().end() ? NULL : i->second;
 }
 
 void WebNavigationTabObserver::RenderFrameDeleted(
     content::RenderFrameHost* render_frame_host) {
   if (navigation_state_.CanSendEvents(render_frame_host) &&
       !navigation_state_.GetNavigationCompleted(render_frame_host)) {
-    helpers::DispatchOnErrorOccurred(
-        web_contents(),
-        render_frame_host,
-        navigation_state_.GetUrl(render_frame_host),
-        net::ERR_ABORTED);
+    DispatchErrorToHelper(render_frame_host, net::ERR_ABORTED);
     navigation_state_.SetErrorOccurredInFrame(render_frame_host);
   }
 }
 
 void WebNavigationTabObserver::FrameDeleted(
     content::RenderFrameHost* render_frame_host) {
   navigation_state_.FrameHostDeleted(render_frame_host);
 }
 
 void WebNavigationTabObserver::RenderFrameHostChanged(
@@ skipping 77 matching lines @@
 
 void WebNavigationTabObserver::DidFailProvisionalLoad(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url,
     int error_code,
     const base::string16& error_description) {
   DVLOG(2) << "DidFailProvisionalLoad("
            << "render_frame_host=" << render_frame_host
            << ", frame_num=" << render_frame_host->GetRoutingID()
            << ", url=" << validated_url << ")";
-  if (navigation_state_.CanSendEvents(render_frame_host)) {
-    helpers::DispatchOnErrorOccurred(
-        web_contents(),
-        render_frame_host,
-        navigation_state_.GetUrl(render_frame_host),
-        error_code);
-  }
+  if (navigation_state_.CanSendEvents(render_frame_host))
+    DispatchErrorToHelper(render_frame_host, error_code);
   navigation_state_.SetErrorOccurredInFrame(render_frame_host);
 }
 
 void WebNavigationTabObserver::DocumentLoadedInFrame(
     content::RenderFrameHost* render_frame_host) {
   DVLOG(2) << "DocumentLoadedInFrame("
            << "render_frame_host=" << render_frame_host
            << ", frame_num=" << render_frame_host->GetRoutingID() << ")";
   if (!navigation_state_.CanSendEvents(render_frame_host))
     return;
@@ skipping 51 matching lines @@
     int error_code,
     const base::string16& error_description) {
   DVLOG(2) << "DidFailLoad("
            << "render_frame_host=" << render_frame_host
            << ", frame_num=" << render_frame_host->GetRoutingID()
            << ", url=" << validated_url << ")";
   // When showing replacement content, we might get load signals for frames
   // that weren't reguarly loaded.
   if (!navigation_state_.IsValidFrame(render_frame_host))
     return;
-  if (navigation_state_.CanSendEvents(render_frame_host)) {
-    helpers::DispatchOnErrorOccurred(
-        web_contents(),
-        render_frame_host,
-        navigation_state_.GetUrl(render_frame_host),
-        error_code);
-  }
+  if (navigation_state_.CanSendEvents(render_frame_host))
+    DispatchErrorToHelper(render_frame_host, error_code);
   navigation_state_.SetErrorOccurredInFrame(render_frame_host);
 }
 
 void WebNavigationTabObserver::DidGetRedirectForResourceRequest(
     content::RenderFrameHost* render_frame_host,
     const content::ResourceRedirectDetails& details) {
   if (details.resource_type != content::RESOURCE_TYPE_MAIN_FRAME &&
       details.resource_type != content::RESOURCE_TYPE_SUB_FRAME) {
     return;
   }
@@ skipping 25 matching lines @@
                                              source_render_frame_host,
                                              new_contents,
                                              url);
 }
 
 void WebNavigationTabObserver::WebContentsDestroyed() {
   g_tab_observer.Get().erase(web_contents());
   registrar_.RemoveAll();
 }
 
+void WebNavigationTabObserver::DispatchErrorToHelper(

[nasko, 2015/05/14 17:00:41]

First of all, it is unrelated to the change you are making - making a method
static. Second, there is no benefit from moving one function call into another
function call that makes that same function call. Why is this method introduced?

+    content::RenderFrameHost* render_frame_host,
+    int error_code) {
+  helpers::DispatchOnErrorOccurred(web_contents(), render_frame_host,
+                                   navigation_state_.GetUrl(render_frame_host),
+                                   error_code);
+}
+
 // See also NavigationController::IsURLInPageNavigation.
 bool WebNavigationTabObserver::IsReferenceFragmentNavigation(
     content::RenderFrameHost* render_frame_host,
     const GURL& url) {
   GURL existing_url = navigation_state_.GetUrl(render_frame_host);
   if (existing_url == url)
     return false;
 
   url::Replacements<char> replacements;
   replacements.ClearRef();
@@ skipping 131 matching lines @@
   return g_factory.Pointer();
 }
 
 void WebNavigationAPI::OnListenerAdded(const EventListenerInfo& details) {
   web_navigation_event_router_.reset(new WebNavigationEventRouter(
       Profile::FromBrowserContext(browser_context_)));
   EventRouter::Get(browser_context_)->UnregisterObserver(this);
 }
 
 }  // namespace extensions