Switch to standard integer types in components/, part 4 of 4.

components/ui/zoom/zoom_controller.h

 // 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.
 
 #ifndef COMPONENTS_UI_ZOOM_ZOOM_CONTROLLER_H_
 #define COMPONENTS_UI_ZOOM_ZOOM_CONTROLLER_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_member.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 class ZoomControllerTest;
 
@@ skipping 174 matching lines @@
   content::HostZoomMap* host_zoom_map_;
 
   scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(ZoomController);
 };
 
 }  // namespace ui_zoom
 
 #endif  // COMPONENTS_UI_ZOOM_ZOOM_CONTROLLER_H_