Switch to standard integer types in chrome/browser/, part 1 of 4.

chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc

 // Copyright 2013 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 "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 102 matching lines @@
   EXPECT_CALL(observer_, PartnerShimLoaded(_)).Times(0);
   PartnerBookmarksShim* shim = partner_bookmarks_shim();
   shim->AddObserver(&observer_);
 
   EXPECT_CALL(observer_, PartnerShimLoaded(shim)).Times(1);
   shim->SetPartnerBookmarksRoot(NULL);
 }
 
 TEST_F(PartnerBookmarksShimTest, ObserverNotifiedOfLoadWithPartnerBookmarks) {
   EXPECT_CALL(observer_, PartnerShimLoaded(_)).Times(0);
-  int64 id = 5;
+  int64_t id = 5;
   BookmarkNode* root_partner_node = new BookmarkPermanentNode(id++);
   BookmarkNode* partner_bookmark1 = new BookmarkNode(id++,
                                                      GURL("http://www.a.com"));
   partner_bookmark1->set_type(BookmarkNode::URL);
   root_partner_node->Add(partner_bookmark1, root_partner_node->child_count());
 
   PartnerBookmarksShim* shim = partner_bookmarks_shim();
   shim->AddObserver(&observer_);
 
   EXPECT_CALL(observer_, PartnerShimLoaded(shim)).Times(1);
@@ skipping 261 matching lines @@
   shim->RenameBookmark(partner_bookmark1, base::ASCIIToUTF16("a2.com"));
   shim->RemoveBookmark(partner_bookmark2);
   EXPECT_EQ(base::ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1));
   EXPECT_FALSE(shim->IsReachable(partner_bookmark2));
 
   // Disable edits and check that edits are not applied anymore.
   PartnerBookmarksShim::DisablePartnerBookmarksEditing();
   EXPECT_EQ(base::ASCIIToUTF16("a"), shim->GetTitle(partner_bookmark1));
   EXPECT_TRUE(shim->IsReachable(partner_bookmark2));
 }