Convert StartPageService and ZoomController to use the new navigation callbacks.

chrome/browser/ui/zoom/zoom_controller_unittest.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 "base/message_loop/message_loop.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/prefs/pref_service.h"
 #include "components/zoom/test/zoom_test_utils.h"
 #include "components/zoom/zoom_controller.h"
 #include "components/zoom/zoom_observer.h"
 #include "content/public/browser/host_zoom_map.h"
-#include "content/public/browser/navigation_details.h"
-#include "content/public/common/frame_navigate_params.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/test_utils.h"
 #include "ipc/ipc_message.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using zoom::ZoomChangedWatcher;
 using zoom::ZoomController;
 
 class ZoomControllerTest : public ChromeRenderViewHostTestHarness {
@@ skipping 20 matching lines @@
 TEST_F(ZoomControllerTest, DidNavigateMainFrame) {
   double zoom_level = zoom_controller_->GetZoomLevel();
   ZoomController::ZoomChangedEventData zoom_change_data(
       web_contents(),
       zoom_level,
       zoom_level,
       ZoomController::ZOOM_MODE_DEFAULT,
       false);
   ZoomChangedWatcher zoom_change_watcher(zoom_controller_.get(),
                                          zoom_change_data);
-  zoom_controller_->DidNavigateMainFrame(content::LoadCommittedDetails(),
-                                         content::FrameNavigateParams());
+  std::unique_ptr<content::NavigationHandle> navigation_handle =
+      content::NavigationHandle::CreateNavigationHandleForTesting(
+          GURL(), rvh()->GetMainFrame(), true);
+  zoom_controller_->DidFinishNavigation(navigation_handle.get());
   zoom_change_watcher.Wait();
 }
 
 TEST_F(ZoomControllerTest, Observe_ZoomController) {
   double old_zoom_level = zoom_controller_->GetZoomLevel();
   double new_zoom_level = 110.0;
 
   NavigateAndCommit(GURL("about:blank"));
 
   ZoomController::ZoomChangedEventData zoom_change_data1(
@@ skipping 55 matching lines @@
       ZoomController::ZOOM_MODE_MANUAL,
       false /* can_show_bubble */);
   {
     ZoomChangedWatcher zoom_change_watcher2(zoom_controller_.get(),
                                             zoom_change_data2);
     zoom_controller_->SetZoomLevel(new_zoom_level2);
     zoom_change_watcher2.Wait();
   }
 
 }