Make command-zero reset page scale in addition to zoom level

components/ui/zoom/zoom_controller.h

Index: components/ui/zoom/zoom_controller.h
diff --git a/components/ui/zoom/zoom_controller.h b/components/ui/zoom/zoom_controller.h
index 359660bf32d4fd909c9998bb5cee34a43b9773d1..8e22ad21fbe54cf26e804d54f899a281931bb37d 100644
--- a/components/ui/zoom/zoom_controller.h
+++ b/components/ui/zoom/zoom_controller.h
@@ -7,6 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
@@ -135,6 +136,10 @@ class ZoomController : public content::WebContentsObserver,
   // Sets the zoom mode, which defines zoom behavior (see enum ZoomMode).
   void SetZoomMode(ZoomMode zoom_mode);
 
+  // Set and query whether or not the page scale factor is one.
+  void SetPageScaleFactorIsOneForTesting(bool is_one);
+  bool PageScaleFactorIsOne() const;
+
   // content::WebContentsObserver overrides:
   void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,