Switch to standard integer types in chrome/browser/ui/cocoa/.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
+#include <stddef.h>
+#include <stdint.h>
 
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
+#include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
@@ skipping 638 matching lines @@
   [bar_ updateState:BookmarkBar::SHOW
          changeType:BookmarkBar::DONT_ANIMATE_STATE_CHANGE];
   EXPECT_TRUE([bar_ dragShouldLockBarVisibility]);
 
   [bar_ updateState:BookmarkBar::DETACHED
          changeType:BookmarkBar::DONT_ANIMATE_STATE_CHANGE];
   EXPECT_FALSE([bar_ dragShouldLockBarVisibility]);
 }
 
 TEST_F(BookmarkBarControllerTest, TagMap) {
-  int64 ids[] = { 1, 3, 4, 40, 400, 4000, 800000000, 2, 123456789 };
-  std::vector<int32> tags;
+  int64_t ids[] = {1, 3, 4, 40, 400, 4000, 800000000, 2, 123456789};
+  std::vector<int32_t> tags;
 
   // Generate some tags
   for (unsigned int i = 0; i < arraysize(ids); i++) {
     tags.push_back([bar_ menuTagFromNodeId:ids[i]]);
   }
 
   // Confirm reverse mapping.
   for (unsigned int i = 0; i < arraysize(ids); i++) {
     EXPECT_EQ(ids[i], [bar_ nodeIdFromMenuTag:tags[i]]);
   }
@@ skipping 17 matching lines @@
   bookmarks::AddIfNotBookmarked(model, gurl, ASCIIToUTF16("small"));
   bookmarks::AddIfNotBookmarked(
       model, GURL("http://www.cnn.com"), ASCIIToUTF16("bigger title"));
   menu = [bar_ menuForFolderNode:model->bookmark_bar_node()];
   EXPECT_EQ([menu numberOfItems], 2);
   NSMenuItem *item = [menu itemWithTitle:@"bigger title"];
   EXPECT_TRUE(item);
   item = [menu itemWithTitle:@"small"];
   EXPECT_TRUE(item);
   if (item) {
-    int64 tag = [bar_ nodeIdFromMenuTag:[item tag]];
+    int64_t tag = [bar_ nodeIdFromMenuTag:[item tag]];
     const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(model, tag);
     EXPECT_TRUE(node);
     EXPECT_EQ(gurl, node->url());
   }
 
   // Test with an actual folder as well
   const BookmarkNode* parent = model->bookmark_bar_node();
   const BookmarkNode* folder = model->AddFolder(parent,
                                                 parent->child_count(),
                                                 ASCIIToUTF16("folder"));
@@ skipping 1430 matching lines @@
                              "2f3b ] 4b ");
   actual = bookmarks::test::ModelStringFromNode(root);
   EXPECT_EQ(expected, actual);
 
   // Verify that the other bookmark folder can't be deleted.
   BookmarkButton *otherButton = [bar_ otherBookmarksButton];
   EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
 }
 
 }  // namespace