Revert of Updates Zoom bubble layout and adds +/- buttons

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"
@@ skipping 48 matching lines @@
   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"));
 
-  // Changing from default to default so the bubble should not be shown.
   ZoomController::ZoomChangedEventData zoom_change_data1(
-      web_contents(), old_zoom_level, old_zoom_level,
-      ZoomController::ZOOM_MODE_ISOLATED, false /* can_show_bubble */);
+      web_contents(),
+      old_zoom_level,
+      old_zoom_level,
+      ZoomController::ZOOM_MODE_ISOLATED,
+      true /* can_show_bubble */);
 
   {
     ZoomChangedWatcher zoom_change_watcher1(zoom_controller_.get(),
                                             zoom_change_data1);
     zoom_controller_->SetZoomMode(ZoomController::ZOOM_MODE_ISOLATED);
     zoom_change_watcher1.Wait();
   }
 
   ZoomController::ZoomChangedEventData zoom_change_data2(
       web_contents(),
@@ skipping 40 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();
   }
 
 }