Convert HandoffActiveURLObserver to use the new navigation callbacks.

chrome/browser/ui/cocoa/handoff_active_url_observer.cc

 // Copyright 2014 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/cocoa/handoff_active_url_observer.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/cocoa/handoff_active_url_observer_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"
 
 HandoffActiveURLObserver::HandoffActiveURLObserver(
     HandoffActiveURLObserverDelegate* delegate)
     : delegate_(delegate),
       active_browser_(nullptr) {
   DCHECK(delegate_);
 
   BrowserList::AddObserver(this);
   SetActiveBrowser(chrome::FindLastActive());
@@ skipping 19 matching lines @@
 
 void HandoffActiveURLObserver::ActiveTabChanged(
     content::WebContents* old_contents,
     content::WebContents* new_contents,
     int index,
     int reason) {
   StartObservingWebContents(new_contents);
   delegate_->HandoffActiveURLChanged(new_contents);
 }
 
-void HandoffActiveURLObserver::DidNavigateMainFrame(
-    const content::LoadCommittedDetails& details,
-    const content::FrameNavigateParams& params) {
+void HandoffActiveURLObserver::DidFinishNavigation(
+     content::NavigationHandle* navigation_handle) {
+  if (!navigation_handle->IsInMainFrame() || !navigation_handle->HasCommitted())
+    return;
+
   delegate_->HandoffActiveURLChanged(web_contents());
 }
 
 void HandoffActiveURLObserver::SetActiveBrowser(Browser* active_browser) {
   if (active_browser == active_browser_)
     return;
 
   if (active_browser_) {
     active_browser_->tab_strip_model()->RemoveObserver(this);
     StopObservingWebContents();
@@ skipping 18 matching lines @@
 void HandoffActiveURLObserver::StopObservingWebContents() {
   Observe(nullptr);
 }
 
 content::WebContents* HandoffActiveURLObserver::GetActiveWebContents() {
   if (!active_browser_)
     return nullptr;
 
   return active_browser_->tab_strip_model()->GetActiveWebContents();
 }