Simplify ZoomController by removing DefaultZoomLevel prefs machinery.

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 "base/prefs/pref_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/browser/ui/zoom/zoom_observer.h"
@@ skipping 47 matching lines @@
       web_contents(),
       zoom_level,
       zoom_level,
       ZoomController::ZOOM_MODE_DEFAULT,
       false);
   EXPECT_CALL(zoom_observer_, OnZoomChanged(zoom_change_data)).Times(1);
   zoom_controller_->DidNavigateMainFrame(content::LoadCommittedDetails(),
                                          content::FrameNavigateParams());
 }
 
-TEST_F(ZoomControllerTest, OnPreferenceChanged) {
-  double zoom_level = zoom_controller_->GetZoomLevel();
-  // Note that while the change in the default zoom level triggers an event,
-  // the current zoom level for this web contents does not change since the
-  // default zoom level in HostZoomMap is not updated.
-  // TODO(wjmaclean) Make sure changes to the default zoom level in preferences
-  // propagate to HostZoomMap. http://crbug.com/391484
-  ZoomController::ZoomChangedEventData zoom_change_data(
-      web_contents(),
-      zoom_level,
-      zoom_level,
-      ZoomController::ZOOM_MODE_DEFAULT,
-      false);
-  EXPECT_CALL(zoom_observer_, OnZoomChanged(zoom_change_data)).Times(1);
-  profile()->GetPrefs()->SetDouble(prefs::kDefaultZoomLevel, 110.0);
-}
-
 TEST_F(ZoomControllerTest, Observe) {
   double new_zoom_level = 110.0;
   // When the event is initiated from HostZoomMap, the old zoom level is not
   // available.
   ZoomController::ZoomChangedEventData zoom_change_data(
       web_contents(),
       new_zoom_level,
       new_zoom_level,
       ZoomController::ZOOM_MODE_DEFAULT,
       false);
@@ skipping 23 matching lines @@
   ZoomController::ZoomChangedEventData zoom_change_data2(
       web_contents(),
       old_zoom_level,
       new_zoom_level,
       ZoomController::ZOOM_MODE_ISOLATED,
       false /* can_show_bubble */);
   EXPECT_CALL(zoom_observer_, OnZoomChanged(zoom_change_data2)).Times(1);
 
   zoom_controller_->SetZoomLevel(new_zoom_level);
 }