Switch to standard integer types in ash/.

ash/test/shelf_view_test_api.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 ASH_TEST_SHELF_VIEW_TEST_API_H_
 #define ASH_TEST_SHELF_VIEW_TEST_API_H_
 
 #include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_item_types.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace gfx {
 class Rect;
 class Size;
 }
 
 namespace ui {
 class Event;
 }
 
@@ skipping 83 matching lines @@
  private:
   ShelfView* shelf_view_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfViewTestAPI);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_SHELF_VIEW_TEST_API_H_