diff options
Diffstat (limited to 'chrome/browser/sync')
109 files changed, 320 insertions, 170 deletions
diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.cc b/chrome/browser/sync/abstract_profile_sync_service_test.cc index d9fa08a..3089b52 100644 --- a/chrome/browser/sync/abstract_profile_sync_service_test.cc +++ b/chrome/browser/sync/abstract_profile_sync_service_test.cc @@ -20,8 +20,9 @@ using syncer::UserShare; /* static */ syncer::ImmutableChangeRecordList - ProfileSyncServiceTestHelper::MakeSingletonChangeRecordList( - int64 node_id, syncer::ChangeRecord::Action action) { +ProfileSyncServiceTestHelper::MakeSingletonChangeRecordList( + int64_t node_id, + syncer::ChangeRecord::Action action) { syncer::ChangeRecord record; record.action = action; record.id = node_id; @@ -31,8 +32,9 @@ syncer::ImmutableChangeRecordList /* static */ syncer::ImmutableChangeRecordList - ProfileSyncServiceTestHelper::MakeSingletonDeletionChangeRecordList( - int64 node_id, const sync_pb::EntitySpecifics& specifics) { +ProfileSyncServiceTestHelper::MakeSingletonDeletionChangeRecordList( + int64_t node_id, + const sync_pb::EntitySpecifics& specifics) { syncer::ChangeRecord record; record.action = syncer::ChangeRecord::ACTION_DELETE; record.id = node_id; diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.h b/chrome/browser/sync/abstract_profile_sync_service_test.h index 2b11b56..d6131b7 100644 --- a/chrome/browser/sync/abstract_profile_sync_service_test.h +++ b/chrome/browser/sync/abstract_profile_sync_service_test.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_SYNC_ABSTRACT_PROFILE_SYNC_SERVICE_TEST_H_ #define CHROME_BROWSER_SYNC_ABSTRACT_PROFILE_SYNC_SERVICE_TEST_H_ +#include <stdint.h> + #include <string> #include "base/callback.h" @@ -27,13 +29,14 @@ struct UserShare; class ProfileSyncServiceTestHelper { public: static syncer::ImmutableChangeRecordList MakeSingletonChangeRecordList( - int64 node_id, syncer::ChangeRecord::Action action); + int64_t node_id, + syncer::ChangeRecord::Action action); // Deletions must provide an EntitySpecifics for the deleted data. static syncer::ImmutableChangeRecordList - MakeSingletonDeletionChangeRecordList( - int64 node_id, - const sync_pb::EntitySpecifics& specifics); + MakeSingletonDeletionChangeRecordList( + int64_t node_id, + const sync_pb::EntitySpecifics& specifics); }; class AbstractProfileSyncServiceTest : public testing::Test { diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc index 9cf8938..17f3c40 100644 --- a/chrome/browser/sync/chrome_sync_client.cc +++ b/chrome/browser/sync/chrome_sync_client.cc @@ -6,6 +6,8 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" diff --git a/chrome/browser/sync/glue/extension_data_type_controller.h b/chrome/browser/sync/glue/extension_data_type_controller.h index aca48d4..6988db3 100644 --- a/chrome/browser/sync/glue/extension_data_type_controller.h +++ b/chrome/browser/sync/glue/extension_data_type_controller.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/sync_driver/generic_change_processor.h" #include "components/sync_driver/ui_data_type_controller.h" diff --git a/chrome/browser/sync/glue/extension_setting_data_type_controller.h b/chrome/browser/sync/glue/extension_setting_data_type_controller.h index d72701e..84322aa 100644 --- a/chrome/browser/sync/glue/extension_setting_data_type_controller.h +++ b/chrome/browser/sync/glue/extension_setting_data_type_controller.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/sync_driver/non_ui_data_type_controller.h" class Profile; diff --git a/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc b/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc index decf4bb..2fb4e24 100644 --- a/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc +++ b/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/sync/glue/extensions_activity_monitor.h" +#include <stdint.h> + #include "base/files/file_path.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" @@ -94,7 +96,7 @@ TEST_F(SyncChromeExtensionsActivityMonitorTest, DISABLED_Basic) { FireBookmarksApiEvent<extensions::BookmarksUpdateFunction>(extension1_, 2); FireBookmarksApiEvent<extensions::BookmarksCreateFunction>(extension1_, 3); FireBookmarksApiEvent<extensions::BookmarksSearchFunction>(extension1_, 5); - const uint32 writes_by_extension1 = 1 + 1 + 2 + 3; + const uint32_t writes_by_extension1 = 1 + 1 + 2 + 3; FireBookmarksApiEvent<extensions::BookmarksRemoveTreeFunction>( extension2_, 8); @@ -103,7 +105,7 @@ TEST_F(SyncChromeExtensionsActivityMonitorTest, DISABLED_Basic) { FireBookmarksApiEvent<extensions::BookmarksGetChildrenFunction>( extension2_, 21); FireBookmarksApiEvent<extensions::BookmarksGetTreeFunction>(extension2_, 33); - const uint32 writes_by_extension2 = 8; + const uint32_t writes_by_extension2 = 8; syncer::ExtensionsActivity::Records results; monitor_.GetExtensionsActivity()->GetAndClearRecords(&results); diff --git a/chrome/browser/sync/glue/session_sync_test_helper.cc b/chrome/browser/sync/glue/session_sync_test_helper.cc index 8b5d61a..e3a9f56 100644 --- a/chrome/browser/sync/glue/session_sync_test_helper.cc +++ b/chrome/browser/sync/glue/session_sync_test_helper.cc @@ -4,6 +4,8 @@ #include "chrome/browser/sync/glue/session_sync_test_helper.h" +#include <stddef.h> + #include "base/strings/utf_string_conversions.h" #include "components/sync_sessions/synced_session.h" #include "sync/protocol/session_specifics.pb.h" diff --git a/chrome/browser/sync/glue/synced_tab_delegate_android.h b/chrome/browser/sync/glue/synced_tab_delegate_android.h index 8d07ef5..e72c8f2 100644 --- a/chrome/browser/sync/glue/synced_tab_delegate_android.h +++ b/chrome/browser/sync/glue/synced_tab_delegate_android.h @@ -8,6 +8,7 @@ #include <string> #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/sync_sessions/synced_tab_delegate.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/sync/glue/theme_data_type_controller.h b/chrome/browser/sync/glue/theme_data_type_controller.h index 091e1cd..1110ade 100644 --- a/chrome/browser/sync/glue/theme_data_type_controller.h +++ b/chrome/browser/sync/glue/theme_data_type_controller.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_GLUE_THEME_DATA_TYPE_CONTROLLER_H_ #define CHROME_BROWSER_SYNC_GLUE_THEME_DATA_TYPE_CONTROLLER_H_ +#include "base/macros.h" #include "components/sync_driver/ui_data_type_controller.h" class Profile; diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc index c170b436..44befad 100644 --- a/chrome/browser/sync/profile_sync_service_android.cc +++ b/chrome/browser/sync/profile_sync_service_android.cc @@ -4,6 +4,9 @@ #include "chrome/browser/sync/profile_sync_service_android.h" +#include <stddef.h> +#include <stdint.h> + #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" diff --git a/chrome/browser/sync/profile_sync_service_android.h b/chrome/browser/sync/profile_sync_service_android.h index d6427f6..c69e78e 100644 --- a/chrome/browser/sync/profile_sync_service_android.h +++ b/chrome/browser/sync/profile_sync_service_android.h @@ -11,6 +11,7 @@ #include "base/android/jni_weak_ref.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/time/time.h" #include "components/invalidation/public/invalidation_util.h" #include "components/sync_driver/sync_prefs.h" diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc index 9e0b082..706d28c 100644 --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <set> #include <string> #include <utility> @@ -14,6 +17,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" @@ -580,7 +584,7 @@ class ProfileSyncServiceAutofillTest return false; } - int64 child_id = autofill_root.GetFirstChildId(); + int64_t child_id = autofill_root.GetFirstChildId(); while (child_id != syncer::kInvalidId) { syncer::ReadNode child_node(&trans); if (child_node.InitByIdLookup(child_id) != BaseNode::INIT_OK) @@ -619,7 +623,7 @@ class ProfileSyncServiceAutofillTest return false; } - int64 child_id = autofill_root.GetFirstChildId(); + int64_t child_id = autofill_root.GetFirstChildId(); while (child_id != syncer::kInvalidId) { syncer::ReadNode child_node(&trans); if (child_node.InitByIdLookup(child_id) != BaseNode::INIT_OK) diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc index e8afc4e..04a1e10 100644 --- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc @@ -6,6 +6,9 @@ // BookmarkChangeProcessor. Write unit tests for // BookmarkModelAssociator separately. +#include <stddef.h> +#include <stdint.h> + #include <map> #include <queue> #include <stack> @@ -14,6 +17,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/location.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" @@ -21,6 +25,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/chrome_bookmark_client.h" #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" @@ -84,7 +89,7 @@ void MakeServerUpdate(syncer::WriteTransaction* trans, node->GetMutableEntryForTest()->PutIsUnappliedUpdate(true); } -void MakeServerUpdate(syncer::WriteTransaction* trans, int64 id) { +void MakeServerUpdate(syncer::WriteTransaction* trans, int64_t id) { syncer::WriteNode node(trans); EXPECT_EQ(BaseNode::INIT_OK, node.InitByIdLookup(id)); MakeServerUpdate(trans, &node); @@ -124,12 +129,12 @@ class FakeServerChange { } // Pretend that the server told the syncer to add a bookmark object. - int64 AddWithMetaInfo(const std::string& title, - const std::string& url, - const BookmarkNode::MetaInfoMap* meta_info_map, - bool is_folder, - int64 parent_id, - int64 predecessor_id) { + int64_t AddWithMetaInfo(const std::string& title, + const std::string& url, + const BookmarkNode::MetaInfoMap* meta_info_map, + bool is_folder, + int64_t parent_id, + int64_t predecessor_id) { syncer::ReadNode parent(trans_); EXPECT_EQ(BaseNode::INIT_OK, parent.InitByIdLookup(parent_id)); syncer::WriteNode node(trans_); @@ -162,47 +167,47 @@ class FakeServerChange { return node.GetId(); } - int64 Add(const std::string& title, - const std::string& url, - bool is_folder, - int64 parent_id, - int64 predecessor_id) { + int64_t Add(const std::string& title, + const std::string& url, + bool is_folder, + int64_t parent_id, + int64_t predecessor_id) { return AddWithMetaInfo(title, url, NULL, is_folder, parent_id, predecessor_id); } // Add a bookmark folder. - int64 AddFolder(const std::string& title, - int64 parent_id, - int64 predecessor_id) { + int64_t AddFolder(const std::string& title, + int64_t parent_id, + int64_t predecessor_id) { return Add(title, std::string(), true, parent_id, predecessor_id); } - int64 AddFolderWithMetaInfo(const std::string& title, - const BookmarkNode::MetaInfoMap* meta_info_map, - int64 parent_id, - int64 predecessor_id) { + int64_t AddFolderWithMetaInfo(const std::string& title, + const BookmarkNode::MetaInfoMap* meta_info_map, + int64_t parent_id, + int64_t predecessor_id) { return AddWithMetaInfo(title, std::string(), meta_info_map, true, parent_id, predecessor_id); } // Add a bookmark. - int64 AddURL(const std::string& title, - const std::string& url, - int64 parent_id, - int64 predecessor_id) { + int64_t AddURL(const std::string& title, + const std::string& url, + int64_t parent_id, + int64_t predecessor_id) { return Add(title, url, false, parent_id, predecessor_id); } - int64 AddURLWithMetaInfo(const std::string& title, - const std::string& url, - const BookmarkNode::MetaInfoMap* meta_info_map, - int64 parent_id, - int64 predecessor_id) { + int64_t AddURLWithMetaInfo(const std::string& title, + const std::string& url, + const BookmarkNode::MetaInfoMap* meta_info_map, + int64_t parent_id, + int64_t predecessor_id) { return AddWithMetaInfo(title, url, meta_info_map, false, parent_id, predecessor_id); } // Pretend that the server told the syncer to delete an object. - void Delete(int64 id) { + void Delete(int64_t id) { { // Delete the sync node. syncer::WriteNode node(trans_); @@ -230,7 +235,7 @@ class FakeServerChange { } // Set a new title value, and return the old value. - std::string ModifyTitle(int64 id, const std::string& new_title) { + std::string ModifyTitle(int64_t id, const std::string& new_title) { syncer::WriteNode node(trans_); EXPECT_EQ(BaseNode::INIT_OK, node.InitByIdLookup(id)); std::string old_title = node.GetTitle(); @@ -242,12 +247,14 @@ class FakeServerChange { // Set a new parent and predecessor value. Return the old parent id. // We could return the old predecessor id, but it turns out not to be // very useful for assertions. - int64 ModifyPosition(int64 id, int64 parent_id, int64 predecessor_id) { + int64_t ModifyPosition(int64_t id, + int64_t parent_id, + int64_t predecessor_id) { syncer::ReadNode parent(trans_); EXPECT_EQ(BaseNode::INIT_OK, parent.InitByIdLookup(parent_id)); syncer::WriteNode node(trans_); EXPECT_EQ(BaseNode::INIT_OK, node.InitByIdLookup(id)); - int64 old_parent_id = node.GetParentId(); + int64_t old_parent_id = node.GetParentId(); if (predecessor_id == 0) { EXPECT_TRUE(node.SetPosition(parent, NULL)); } else { @@ -260,7 +267,7 @@ class FakeServerChange { return old_parent_id; } - void ModifyCreationTime(int64 id, int64 creation_time_us) { + void ModifyCreationTime(int64_t id, int64_t creation_time_us) { syncer::WriteNode node(trans_); ASSERT_EQ(BaseNode::INIT_OK, node.InitByIdLookup(id)); sync_pb::BookmarkSpecifics specifics = node.GetBookmarkSpecifics(); @@ -269,7 +276,7 @@ class FakeServerChange { SetModified(id); } - void ModifyMetaInfo(int64 id, + void ModifyMetaInfo(int64_t id, const BookmarkNode::MetaInfoMap& meta_info_map) { syncer::WriteNode node(trans_); ASSERT_EQ(BaseNode::INIT_OK, node.InitByIdLookup(id)); @@ -292,7 +299,7 @@ class FakeServerChange { private: // Helper function to push an ACTION_UPDATE record onto the back // of the changelist. - void SetModified(int64 id) { + void SetModified(int64_t id) { // Coalesce multi-property edits. if (!changes_.empty() && changes_.back().id == id && changes_.back().action == @@ -404,8 +411,8 @@ class ProfileSyncServiceBookmarkTest : public testing::Test { // change the sync model directly after ModelAssociation. This function can // be invoked prior to model association to set up first-time sync model // association scenarios. - int64 AddFolderToShare(syncer::WriteTransaction* trans, - const std::string& title) { + int64_t AddFolderToShare(syncer::WriteTransaction* trans, + const std::string& title) { EXPECT_FALSE(model_associator_); // Be sure to call CreatePermanentBookmarkNodes(), otherwise this will fail. @@ -429,10 +436,10 @@ class ProfileSyncServiceBookmarkTest : public testing::Test { // the sync model directly after ModelAssociation. This function can be // invoked prior to model association to set up first-time sync model // association scenarios. - int64 AddBookmarkToShare(syncer::WriteTransaction* trans, - int64 parent_id, - const std::string& title, - const std::string& url) { + int64_t AddBookmarkToShare(syncer::WriteTransaction* trans, + int64_t parent_id, + const std::string& title, + const std::string& url) { EXPECT_FALSE(model_associator_); syncer::ReadNode parent(trans); @@ -510,7 +517,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test { EXPECT_EQ(BaseNode::INIT_OK, root.InitTypeRoot(type)); // Loop through creating permanent nodes as necessary. - int64 last_child_id = syncer::kInvalidId; + int64_t last_child_id = syncer::kInvalidId; for (int i = 0; i < kNumPermanentNodes; ++i) { // First check if the node already exists. This is for tests that involve // persistence and set up sync more than once. @@ -694,51 +701,51 @@ class ProfileSyncServiceBookmarkTest : public testing::Test { } void ExpectBrowserNodeMatching(syncer::BaseTransaction* trans, - int64 sync_id) { + int64_t sync_id) { EXPECT_TRUE(sync_id); const BookmarkNode* bnode = model_associator_->GetChromeNodeFromSyncId(sync_id); ASSERT_TRUE(bnode); ASSERT_TRUE(CanSyncNode(bnode)); - int64 id = model_associator_->GetSyncIdFromChromeId(bnode->id()); + int64_t id = model_associator_->GetSyncIdFromChromeId(bnode->id()); EXPECT_EQ(id, sync_id); ExpectSyncerNodeMatching(trans, bnode); } - void ExpectBrowserNodeUnknown(int64 sync_id) { + void ExpectBrowserNodeUnknown(int64_t sync_id) { EXPECT_FALSE(model_associator_->GetChromeNodeFromSyncId(sync_id)); } - void ExpectBrowserNodeKnown(int64 sync_id) { + void ExpectBrowserNodeKnown(int64_t sync_id) { EXPECT_TRUE(model_associator_->GetChromeNodeFromSyncId(sync_id)); } void ExpectSyncerNodeKnown(const BookmarkNode* node) { - int64 sync_id = model_associator_->GetSyncIdFromChromeId(node->id()); + int64_t sync_id = model_associator_->GetSyncIdFromChromeId(node->id()); EXPECT_NE(sync_id, syncer::kInvalidId); } void ExpectSyncerNodeUnknown(const BookmarkNode* node) { - int64 sync_id = model_associator_->GetSyncIdFromChromeId(node->id()); + int64_t sync_id = model_associator_->GetSyncIdFromChromeId(node->id()); EXPECT_EQ(sync_id, syncer::kInvalidId); } - void ExpectBrowserNodeTitle(int64 sync_id, const std::string& title) { + void ExpectBrowserNodeTitle(int64_t sync_id, const std::string& title) { const BookmarkNode* bnode = model_associator_->GetChromeNodeFromSyncId(sync_id); ASSERT_TRUE(bnode); EXPECT_EQ(bnode->GetTitle(), base::UTF8ToUTF16(title)); } - void ExpectBrowserNodeURL(int64 sync_id, const std::string& url) { + void ExpectBrowserNodeURL(int64_t sync_id, const std::string& url) { const BookmarkNode* bnode = model_associator_->GetChromeNodeFromSyncId(sync_id); ASSERT_TRUE(bnode); EXPECT_EQ(GURL(url), bnode->url()); } - void ExpectBrowserNodeParent(int64 sync_id, int64 parent_sync_id) { + void ExpectBrowserNodeParent(int64_t sync_id, int64_t parent_sync_id) { const BookmarkNode* node = model_associator_->GetChromeNodeFromSyncId(sync_id); ASSERT_TRUE(node); @@ -760,10 +767,10 @@ class ProfileSyncServiceBookmarkTest : public testing::Test { EXPECT_EQ(root->GetIndexOf(model_->mobile_node()), 2); #endif // defined(OS_IOS) || defined(OS_ANDROID) - std::stack<int64> stack; + std::stack<int64_t> stack; stack.push(bookmark_bar_id()); while (!stack.empty()) { - int64 id = stack.top(); + int64_t id = stack.top(); stack.pop(); if (!id) continue; @@ -782,17 +789,17 @@ class ProfileSyncServiceBookmarkTest : public testing::Test { ExpectModelMatch(&trans); } - int64 mobile_bookmarks_id() { + int64_t mobile_bookmarks_id() { return model_associator_->GetSyncIdFromChromeId(model_->mobile_node()->id()); } - int64 other_bookmarks_id() { + int64_t other_bookmarks_id() { return model_associator_->GetSyncIdFromChromeId(model_->other_node()->id()); } - int64 bookmark_bar_id() { + int64_t bookmark_bar_id() { return model_associator_->GetSyncIdFromChromeId( model_->bookmark_bar_node()->id()); } @@ -843,7 +850,7 @@ TEST_F(ProfileSyncServiceBookmarkTest, InitialModelAssociate) { { syncer::WriteTransaction trans(FROM_HERE, test_user_share_.user_share()); for (int i = 0; i < kNumFolders; ++i) { - int64 folder_id = + int64_t folder_id = AddFolderToShare(&trans, base::StringPrintf("folder%05d", i)); for (int j = 0; j < kNumBookmarksPerFolder; ++j) { AddBookmarkToShare( @@ -889,7 +896,7 @@ TEST_F(ProfileSyncServiceBookmarkTest, InitialModelAssociateWithDeleteJournal) { CreatePermanentBookmarkNodes(); // Create entries matching the folder and the bookmark above. - int64 folder_id, bookmark_id; + int64_t folder_id, bookmark_id; { syncer::WriteTransaction trans(FROM_HERE, test_user_share_.user_share()); folder_id = AddFolderToShare(&trans, "foobar"); @@ -930,8 +937,8 @@ TEST_F(ProfileSyncServiceBookmarkTest, const int kFolderToIncludeBookmarks = 7; const int kBookmarkToDelete = 4; - int64 folder_ids[kNumFolders]; - int64 bookmark_ids[kNumBookmarks]; + int64_t folder_ids[kNumFolders]; + int64_t bookmark_ids[kNumBookmarks]; // Create native folders and bookmarks with identical names. Only // one of the folders contains bookmarks and others are empty. Here is the @@ -972,15 +979,15 @@ TEST_F(ProfileSyncServiceBookmarkTest, CreatePermanentBookmarkNodes(); - int64 sync_bookmark_id_to_delete = 0; + int64_t sync_bookmark_id_to_delete = 0; { // Create sync folders matching native folders above. - int64 parent_id = 0; + int64_t parent_id = 0; syncer::WriteTransaction trans(FROM_HERE, test_user_share_.user_share()); // Create in reverse order because AddFolderToShare passes NULL for // |predecessor| argument. for (int i = kNumFolders - 1; i >= 0; i--) { - int64 id = AddFolderToShare(&trans, "folder"); + int64_t id = AddFolderToShare(&trans, "folder"); // Pre-map sync folders to native folders by setting // external ID. This will verify that the association algorithm picks @@ -1065,7 +1072,7 @@ TEST_F(ProfileSyncServiceBookmarkTest, InitialModelAssociateWithInvalidUrl) { CreatePermanentBookmarkNodes(); { syncer::WriteTransaction trans(FROM_HERE, test_user_share_.user_share()); - int64 folder_id = AddFolderToShare(&trans, "folder"); + int64_t folder_id = AddFolderToShare(&trans, "folder"); // Please note that each AddBookmarkToShare inserts the node at the front // so the actual order of children in the directory will be opposite. AddBookmarkToShare(&trans, folder_id, "node2", "http://www.node2.com/"); @@ -1156,13 +1163,13 @@ TEST_F(ProfileSyncServiceBookmarkTest, ServerChangeProcessing) { syncer::WriteTransaction trans(FROM_HERE, test_user_share_.user_share()); FakeServerChange adds(&trans); - int64 f1 = adds.AddFolder("Server Folder B", bookmark_bar_id(), 0); - int64 f2 = adds.AddFolder("Server Folder A", bookmark_bar_id(), f1); - int64 u1 = adds.AddURL("Some old site", "ftp://nifty.andrew.cmu.edu/", - bookmark_bar_id(), f2); - int64 u2 = adds.AddURL("Nifty", "ftp://nifty.andrew.cmu.edu/", f1, 0); + int64_t f1 = adds.AddFolder("Server Folder B", bookmark_bar_id(), 0); + int64_t f2 = adds.AddFolder("Server Folder A", bookmark_bar_id(), f1); + int64_t u1 = adds.AddURL("Some old site", "ftp://nifty.andrew.cmu.edu/", + bookmark_bar_id(), f2); + int64_t u2 = adds.AddURL("Nifty", "ftp://nifty.andrew.cmu.edu/", f1, 0); // u3 is a duplicate URL - int64 u3 = adds.AddURL("Nifty2", "ftp://nifty.andrew.cmu.edu/", f1, u2); + int64_t u3 = adds.AddURL("Nifty2", "ftp://nifty.andrew.cmu.edu/", f1, u2); // u4 is a duplicate title, different URL. adds.AddURL("Some old site", "http://slog.thestranger.com/", bookmark_bar_id(), u1); @@ -1173,8 +1180,8 @@ TEST_F(ProfileSyncServiceBookmarkTest, ServerChangeProcessing) { "scrollbars=0,status=0,toolbar=0,width=300," \ "height=300,resizable');});"); adds.AddURL(std::string(), javascript_url, other_bookmarks_id(), 0); - int64 u6 = adds.AddURL( - "Sync1", "http://www.syncable.edu/", mobile_bookmarks_id(), 0); + int64_t u6 = adds.AddURL("Sync1", "http://www.syncable.edu/", + mobile_bookmarks_id(), 0); syncer::ChangeRecordList::const_iterator it; // The bookmark model shouldn't yet have seen any of the nodes of |adds|. @@ -1194,14 +1201,14 @@ TEST_F(ProfileSyncServiceBookmarkTest, ServerChangeProcessing) { // TODO(ncarter): Determine if we allow ModifyURL ops or not. /* std::string u2_old_url = mods.ModifyURL(u2, "http://www.google.com"); */ std::string u2_old_title = mods.ModifyTitle(u2, "The Google"); - int64 u2_old_parent = mods.ModifyPosition(u2, f2, 0); + int64_t u2_old_parent = mods.ModifyPosition(u2, f2, 0); // Now move f1 after u2. std::string f1_old_title = mods.ModifyTitle(f1, "Server Folder C"); - int64 f1_old_parent = mods.ModifyPosition(f1, f2, u2); + int64_t f1_old_parent = mods.ModifyPosition(f1, f2, u2); // Then add u3 after f1. - int64 u3_old_parent = mods.ModifyPosition(u3, f2, f1); + int64_t u3_old_parent = mods.ModifyPosition(u3, f2, f1); std::string u6_old_title = mods.ModifyTitle(u6, "Mobile Folder A"); @@ -1256,14 +1263,14 @@ TEST_F(ProfileSyncServiceBookmarkTest, ServerChangeRequiringFosterParent) { // ApplyModelChanges puts a temporary foster parent node. std::string url("http://dev.chromium.org/"); FakeServerChange adds(&trans); - int64 f0 = other_bookmarks_id(); // + other_node - int64 f1 = adds.AddFolder("f1", f0, 0); // + f1 - int64 f2 = adds.AddFolder("f2", f1, 0); // + f2 - int64 u3 = adds.AddURL( "u3", url, f2, 0); // + u3 NOLINT - int64 u4 = adds.AddURL( "u4", url, f2, u3); // + u4 NOLINT - int64 u5 = adds.AddURL( "u5", url, f1, f2); // + u5 NOLINT - int64 f6 = adds.AddFolder("f6", f1, u5); // + f6 - int64 u7 = adds.AddURL( "u7", url, f0, f1); // + u7 NOLINT + int64_t f0 = other_bookmarks_id(); // + other_node + int64_t f1 = adds.AddFolder("f1", f0, 0); // + f1 + int64_t f2 = adds.AddFolder("f2", f1, 0); // + f2 + int64_t u3 = adds.AddURL("u3", url, f2, 0); // + u3 NOLINT + int64_t u4 = adds.AddURL("u4", url, f2, u3); // + u4 NOLINT + int64_t u5 = adds.AddURL("u5", url, f1, f2); // + u5 NOLINT + int64_t f6 = adds.AddFolder("f6", f1, u5); // + f6 + int64_t u7 = adds.AddURL("u7", url, f0, f1); // + u7 NOLINT syncer::ChangeRecordList::const_iterator it; // The bookmark model shouldn't yet have seen any of the nodes of |adds|. @@ -1508,11 +1515,11 @@ TEST_F(ProfileSyncServiceBookmarkTest, ApplySyncDeletesFromJournal) { // +-- Folder 2 // +-- URL 2 LoadBookmarkModel(DELETE_EXISTING_STORAGE, SAVE_TO_STORAGE); - int64 u0 = 0; - int64 f1 = 0; - int64 u1 = 0; - int64 f2 = 0; - int64 u2 = 0; + int64_t u0 = 0; + int64_t f1 = 0; + int64_t u1 = 0; + int64_t f2 = 0; + int64_t u2 = 0; StartSync(); int fixed_sync_bk_count = GetSyncBookmarkCount(); { @@ -1591,7 +1598,7 @@ struct TestData { }; // Map from bookmark node ID to its version. -typedef std::map<int64, int64> BookmarkNodeVersionMap; +typedef std::map<int64_t, int64_t> BookmarkNodeVersionMap; // TODO(ncarter): Integrate the existing TestNode/PopulateNodeFromString code // in the bookmark model unittest, to make it simpler to set up test data @@ -2214,8 +2221,8 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData, UpdateDateAdded) { // and Sync. { syncer::ReadTransaction trans(FROM_HERE, test_user_share_.user_share()); - int64 sync_version = trans.GetModelVersion(syncer::BOOKMARKS); - int64 native_version = model_->root_node()->sync_transaction_version(); + int64_t sync_version = trans.GetModelVersion(syncer::BOOKMARKS); + int64_t native_version = model_->root_node()->sync_transaction_version(); EXPECT_EQ(native_version, sync_version); } @@ -2242,8 +2249,7 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData, UpdateDateAdded) { const std::string kTitle = "Some site"; const std::string kUrl = "http://www.whatwhat.yeah/"; const int kCreationTime = 30; - int64 id = adds.AddURL(kTitle, kUrl, - bookmark_bar_id(), 0); + int64_t id = adds.AddURL(kTitle, kUrl, bookmark_bar_id(), 0); adds.ApplyPendingChanges(change_processor_.get()); FakeServerChange updates(&trans); updates.ModifyCreationTime(id, kCreationTime); @@ -2283,8 +2289,8 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData, // in sync with the sync version. { syncer::ReadTransaction trans(FROM_HERE, test_user_share_.user_share()); - int64 sync_version = trans.GetModelVersion(syncer::BOOKMARKS); - int64 native_version = model_->root_node()->sync_transaction_version(); + int64_t sync_version = trans.GetModelVersion(syncer::BOOKMARKS); + int64_t native_version = model_->root_node()->sync_transaction_version(); EXPECT_EQ(native_version, sync_version); } } @@ -2301,13 +2307,13 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData, UpdateMetaInfoFromSync) { FakeServerChange adds(&trans); BookmarkNode::MetaInfoMap folder_meta_info; folder_meta_info["folder"] = "foldervalue"; - int64 folder_id = adds.AddFolderWithMetaInfo( + int64_t folder_id = adds.AddFolderWithMetaInfo( "folder title", &folder_meta_info, bookmark_bar_id(), 0); BookmarkNode::MetaInfoMap node_meta_info; node_meta_info["node"] = "nodevalue"; node_meta_info["other"] = "othervalue"; - int64 id = adds.AddURLWithMetaInfo("node title", "http://www.foo.com", - &node_meta_info, folder_id, 0); + int64_t id = adds.AddURLWithMetaInfo("node title", "http://www.foo.com", + &node_meta_info, folder_id, 0); adds.ApplyPendingChanges(change_processor_.get()); // Verify that the nodes are created with the correct meta info. @@ -2375,7 +2381,7 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData, MetaInfoPreservedOnNonChange) { StartSync(); std::string orig_specifics; - int64 sync_id; + int64_t sync_id; const BookmarkNode* bookmark; // Create bookmark folder node containing meta info. @@ -2383,7 +2389,7 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData, MetaInfoPreservedOnNonChange) { syncer::WriteTransaction trans(FROM_HERE, test_user_share_.user_share()); FakeServerChange adds(&trans); - int64 folder_id = adds.AddFolder("folder title", bookmark_bar_id(), 0); + int64_t folder_id = adds.AddFolder("folder title", bookmark_bar_id(), 0); BookmarkNode::MetaInfoMap node_meta_info; node_meta_info["one"] = "1"; @@ -2428,7 +2434,7 @@ void ProfileSyncServiceBookmarkTestWithData::GetTransactionVersions( const BookmarkNode* n = nodes.front(); nodes.pop(); - int64 version = n->sync_transaction_version(); + int64_t version = n->sync_transaction_version(); EXPECT_NE(BookmarkNode::kInvalidSyncTransactionVersion, version); (*node_versions)[n->id()] = version; @@ -2546,7 +2552,7 @@ TEST_F(ProfileSyncServiceBookmarkTestWithData, PersistenceError) { // Now shut down sync and artificially increment the native model's version. StopSync(); - int64 root_version = initial_versions[model_->root_node()->id()]; + int64_t root_version = initial_versions[model_->root_node()->id()]; model_->SetNodeSyncTransactionVersion(model_->root_node(), root_version + 1); // Upon association, bookmarks should fail to associate. @@ -2603,7 +2609,7 @@ TEST_F(ProfileSyncServiceBookmarkTest, TestUnsupportedNodes) { // Verify that these changes are ignored by Sync. EXPECT_EQ(sync_bookmark_count, GetSyncBookmarkCount()); - int64 sync_id = model_associator_->GetSyncIdFromChromeId(node->id()); + int64_t sync_id = model_associator_->GetSyncIdFromChromeId(node->id()); EXPECT_EQ(syncer::kInvalidId, sync_id); // Verify that Sync ignores deleting this node. diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc index 567bf7b..1b25888 100644 --- a/chrome/browser/sync/profile_sync_service_factory.cc +++ b/chrome/browser/sync/profile_sync_service_factory.cc @@ -8,6 +8,7 @@ #include "base/memory/singleton.h" #include "base/time/time.h" +#include "build/build_config.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/sync/profile_sync_service_factory_unittest.cc b/chrome/browser/sync/profile_sync_service_factory_unittest.cc index 84ba8e7..a7e4264 100644 --- a/chrome/browser/sync/profile_sync_service_factory_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_factory_unittest.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/command_line.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/test/base/testing_profile.h" #include "components/browser_sync/browser/profile_sync_service.h" diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc index 57bbb39..4d670c7 100644 --- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc @@ -8,6 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/signin/account_tracker_service_factory.h" #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" #include "chrome/browser/signin/fake_signin_manager_builder.h" diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc index c21a42a..b4b086b 100644 --- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <string> #include <utility> #include <vector> @@ -297,7 +300,7 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest { syncer::BaseNode::INIT_OK) return; - int64 child_id = typed_url_root.GetFirstChildId(); + int64_t child_id = typed_url_root.GetFirstChildId(); while (child_id != syncer::kInvalidId) { syncer::ReadNode child_node(&trans); if (child_node.InitByIdLookup(child_id) != syncer::BaseNode::INIT_OK) @@ -378,7 +381,7 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest { static history::URLRow MakeTypedUrlEntry(const char* url, const char* title, int typed_count, - int64 last_visit, + int64_t last_visit, bool hidden, history::VisitVector* visits) { // Give each URL a unique ID, to mimic the behavior of the real database. diff --git a/chrome/browser/sync/sessions/notification_service_sessions_router.h b/chrome/browser/sync/sessions/notification_service_sessions_router.h index af7f35f..8cf2db6 100644 --- a/chrome/browser/sync/sessions/notification_service_sessions_router.h +++ b/chrome/browser/sync/sessions/notification_service_sessions_router.h @@ -8,6 +8,7 @@ #include <set> #include "base/callback_list.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "components/sync_sessions/sessions_sync_manager.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc index 53c8d459..10e3d64 100644 --- a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc +++ b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc @@ -4,7 +4,12 @@ #include "components/sync_sessions/sessions_sync_manager.h" +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/sync/chrome_sync_client.h" #include "chrome/browser/sync/glue/session_sync_test_helper.h" @@ -184,10 +189,9 @@ class TestSyncProcessorStub : public syncer::SyncChangeProcessor { syncer::SyncDataList sync_data_to_return_; }; -syncer::SyncChange MakeRemoteChange( - int64 id, - const sync_pb::SessionSpecifics& specifics, - SyncChange::SyncChangeType type) { +syncer::SyncChange MakeRemoteChange(int64_t id, + const sync_pb::SessionSpecifics& specifics, + SyncChange::SyncChangeType type) { sync_pb::EntitySpecifics entity; entity.mutable_session()->CopyFrom(specifics); return syncer::SyncChange( diff --git a/chrome/browser/sync/supervised_user_signin_manager_wrapper.h b/chrome/browser/sync/supervised_user_signin_manager_wrapper.h index d5a018f..64421ea 100644 --- a/chrome/browser/sync/supervised_user_signin_manager_wrapper.h +++ b/chrome/browser/sync/supervised_user_signin_manager_wrapper.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "components/sync_driver/signin_manager_wrapper.h" class Profile; diff --git a/chrome/browser/sync/sync_error_notifier_ash.cc b/chrome/browser/sync/sync_error_notifier_ash.cc index 128a33a..4e4f3e2 100644 --- a/chrome/browser/sync/sync_error_notifier_ash.cc +++ b/chrome/browser/sync/sync_error_notifier_ash.cc @@ -7,8 +7,10 @@ #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ash/system/system_notifier.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_ui_manager.h" diff --git a/chrome/browser/sync/sync_error_notifier_ash.h b/chrome/browser/sync/sync_error_notifier_ash.h index b9aa6ba..dd05ff1 100644 --- a/chrome/browser/sync/sync_error_notifier_ash.h +++ b/chrome/browser/sync/sync_error_notifier_ash.h @@ -7,8 +7,8 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "components/keyed_service/core/keyed_service.h" #include "components/sync_driver/sync_error_controller.h" diff --git a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc index 798a2ea..90e3571 100644 --- a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc +++ b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc @@ -4,8 +4,12 @@ #include "chrome/browser/sync/sync_error_notifier_ash.h" +#include <stddef.h> + #include "ash/test/ash_test_base.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_ui_manager.h" diff --git a/chrome/browser/sync/sync_error_notifier_factory_ash.h b/chrome/browser/sync/sync_error_notifier_factory_ash.h index 86ac672..995679e 100644 --- a/chrome/browser/sync/sync_error_notifier_factory_ash.h +++ b/chrome/browser/sync/sync_error_notifier_factory_ash.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_SYNC_ERROR_NOTIFIER_FACTORY_ASH_H_ #define CHROME_BROWSER_SYNC_SYNC_ERROR_NOTIFIER_FACTORY_ASH_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" diff --git a/chrome/browser/sync/sync_global_error.h b/chrome/browser/sync/sync_global_error.h index 36810ce..cbdddd3 100644 --- a/chrome/browser/sync/sync_global_error.h +++ b/chrome/browser/sync/sync_global_error.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_ #define CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "chrome/browser/ui/global_error/global_error.h" #include "components/keyed_service/core/keyed_service.h" #include "components/sync_driver/sync_error_controller.h" diff --git a/chrome/browser/sync/sync_global_error_factory.h b/chrome/browser/sync/sync_global_error_factory.h index 5f11ba0..19c25dd 100644 --- a/chrome/browser/sync/sync_global_error_factory.h +++ b/chrome/browser/sync/sync_global_error_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_FACTORY_H_ #define CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" diff --git a/chrome/browser/sync/sync_global_error_unittest.cc b/chrome/browser/sync/sync_global_error_unittest.cc index 80836d8..ae20eaa 100644 --- a/chrome/browser/sync/sync_global_error_unittest.cc +++ b/chrome/browser/sync/sync_global_error_unittest.cc @@ -4,6 +4,7 @@ #include "chrome/browser/sync/sync_global_error.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/sync/profile_sync_test_util.h" diff --git a/chrome/browser/sync/sync_startup_tracker.h b/chrome/browser/sync/sync_startup_tracker.h index 1753282..eb73612 100644 --- a/chrome/browser/sync/sync_startup_tracker.h +++ b/chrome/browser/sync/sync_startup_tracker.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SYNC_SYNC_STARTUP_TRACKER_H_ #define CHROME_BROWSER_SYNC_SYNC_STARTUP_TRACKER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/sync_driver/sync_service_observer.h" class Profile; diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 76f4e41..d26bc06 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -4,12 +4,15 @@ #include "chrome/browser/sync/sync_ui_util.h" +#include <stdint.h> + #include "base/i18n/number_formatting.h" #include "base/i18n/time_formatting.h" #include "base/metrics/field_trial.h" #include "base/prefs/pref_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/signin/signin_error_controller_factory.h" @@ -392,7 +395,7 @@ MessageType GetStatus(Profile* profile, nullptr, nullptr); } -base::string16 ConstructTime(int64 time_in_int) { +base::string16 ConstructTime(int64_t time_in_int) { base::Time time = base::Time::FromInternalValue(time_in_int); // If time is null the format function returns a time in 1969. diff --git a/chrome/browser/sync/sync_ui_util.h b/chrome/browser/sync/sync_ui_util.h index 8530033..6055df5 100644 --- a/chrome/browser/sync/sync_ui_util.h +++ b/chrome/browser/sync/sync_ui_util.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_SYNC_SYNC_UI_UTIL_H_ #include "base/strings/string16.h" +#include "build/build_config.h" class Profile; class ProfileSyncService; diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc index c42c2dd..7d4672b 100644 --- a/chrome/browser/sync/sync_ui_util_unittest.cc +++ b/chrome/browser/sync/sync_ui_util_unittest.cc @@ -2,9 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/account_tracker_service_factory.h" #include "chrome/browser/signin/chrome_signin_client_factory.h" diff --git a/chrome/browser/sync/test/integration/apps_helper.cc b/chrome/browser/sync/test/integration/apps_helper.cc index 2157418..2b76b4d 100644 --- a/chrome/browser/sync/test/integration/apps_helper.cc +++ b/chrome/browser/sync/test/integration/apps_helper.cc @@ -5,6 +5,7 @@ #include "chrome/browser/sync/test/integration/apps_helper.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/sync/test/integration/apps_helper.h b/chrome/browser/sync/test/integration/apps_helper.h index 1662b93..27567e3 100644 --- a/chrome/browser/sync/test/integration/apps_helper.h +++ b/chrome/browser/sync/test/integration/apps_helper.h @@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_APPS_HELPER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/sync/test/integration/sync_test.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/sync/test/integration/autofill_helper.cc b/chrome/browser/sync/test/integration/autofill_helper.cc index 88f06ed..b02a42c 100644 --- a/chrome/browser/sync/test/integration/autofill_helper.cc +++ b/chrome/browser/sync/test/integration/autofill_helper.cc @@ -4,6 +4,8 @@ #include "chrome/browser/sync/test/integration/autofill_helper.h" +#include <stddef.h> + #include "base/guid.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/chrome_notification_types.h" diff --git a/chrome/browser/sync/test/integration/await_match_status_change_checker.h b/chrome/browser/sync/test/integration/await_match_status_change_checker.h index 5e1cb19..d7ef744 100644 --- a/chrome/browser/sync/test/integration/await_match_status_change_checker.h +++ b/chrome/browser/sync/test/integration/await_match_status_change_checker.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "chrome/browser/sync/test/integration/multi_client_status_change_checker.h" diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc index ccb4308..a21790c 100644 --- a/chrome/browser/sync/test/integration/bookmarks_helper.cc +++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc @@ -4,12 +4,15 @@ #include "chrome/browser/sync/test/integration/bookmarks_helper.h" +#include <stddef.h> + #include <set> #include <vector> #include "base/bind.h" #include "base/compiler_specific.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/path_service.h" #include "base/rand_util.h" #include "base/run_loop.h" diff --git a/chrome/browser/sync/test/integration/dictionary_helper.h b/chrome/browser/sync/test/integration/dictionary_helper.h index 52d0a0d..659155b 100644 --- a/chrome/browser/sync/test/integration/dictionary_helper.h +++ b/chrome/browser/sync/test/integration/dictionary_helper.h @@ -5,6 +5,8 @@ #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_DICTIONARY_HELPER_H_ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_DICTIONARY_HELPER_H_ +#include <stddef.h> + #include <string> namespace dictionary_helper { diff --git a/chrome/browser/sync/test/integration/dictionary_load_observer.h b/chrome/browser/sync/test/integration/dictionary_load_observer.h index 9110c7e..d08c372 100644 --- a/chrome/browser/sync/test/integration/dictionary_load_observer.h +++ b/chrome/browser/sync/test/integration/dictionary_load_observer.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_DICTIONARY_LOAD_OBSERVER_H_ #include "base/callback.h" +#include "base/macros.h" #include "chrome/browser/spellchecker/spellcheck_custom_dictionary.h" // DictionaryLoadObserver is used when blocking until the diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc index 5087b86..87e8f65 100644 --- a/chrome/browser/sync/test/integration/enable_disable_test.cc +++ b/chrome/browser/sync/test/integration/enable_disable_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/sync_test.h" #include "components/browser_sync/browser/profile_sync_service.h" diff --git a/chrome/browser/sync/test/integration/extensions_helper.cc b/chrome/browser/sync/test/integration/extensions_helper.cc index 4097fe6..7f9a2fb 100644 --- a/chrome/browser/sync/test/integration/extensions_helper.cc +++ b/chrome/browser/sync/test/integration/extensions_helper.cc @@ -5,6 +5,7 @@ #include "chrome/browser/sync/test/integration/extensions_helper.h" #include "base/logging.h" +#include "base/macros.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/status_change_checker.h" diff --git a/chrome/browser/sync/test/integration/extensions_helper.h b/chrome/browser/sync/test/integration/extensions_helper.h index f789d0c..f807abf 100644 --- a/chrome/browser/sync/test/integration/extensions_helper.h +++ b/chrome/browser/sync/test/integration/extensions_helper.h @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync/test/integration/fake_server_invalidation_service.h b/chrome/browser/sync/test/integration/fake_server_invalidation_service.h index 71bb558..a8c0905 100644 --- a/chrome/browser/sync/test/integration/fake_server_invalidation_service.h +++ b/chrome/browser/sync/test/integration/fake_server_invalidation_service.h @@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/basictypes.h" +#include "base/macros.h" #include "components/invalidation/impl/invalidator_registrar.h" #include "components/invalidation/public/invalidation_service.h" #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" diff --git a/chrome/browser/sync/test/integration/migration_test.cc b/chrome/browser/sync/test/integration/migration_test.cc index 77740a2..9c1d9e3 100644 --- a/chrome/browser/sync/test/integration/migration_test.cc +++ b/chrome/browser/sync/test/integration/migration_test.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc index 1a8dec8..f92d4ea 100644 --- a/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc +++ b/chrome/browser/sync/test/integration/multiple_client_dictionary_sync_test.cc @@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "chrome/browser/sync/test/integration/dictionary_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc index 27e19d2..514ae36 100644 --- a/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/multiple_client_passwords_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/sync/test/integration/passwords_helper.h" diff --git a/chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h b/chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h index b33aca0..59fe52c 100644 --- a/chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h +++ b/chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_P2P_INVALIDATION_FORWARDER_H_ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_P2P_INVALIDATION_FORWARDER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "components/sync_driver/sync_service_observer.h" class ProfileSyncService; diff --git a/chrome/browser/sync/test/integration/p2p_sync_refresher.h b/chrome/browser/sync/test/integration/p2p_sync_refresher.h index 19c0176..7a71f25 100644 --- a/chrome/browser/sync/test/integration/p2p_sync_refresher.h +++ b/chrome/browser/sync/test/integration/p2p_sync_refresher.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_P2P_SYNC_REFRESHER_H_ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_P2P_SYNC_REFRESHER_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "components/sync_driver/sync_service_observer.h" class Profile; diff --git a/chrome/browser/sync/test/integration/passwords_helper.cc b/chrome/browser/sync/test/integration/passwords_helper.cc index 749532f..e6f8156 100644 --- a/chrome/browser/sync/test/integration/passwords_helper.cc +++ b/chrome/browser/sync/test/integration/passwords_helper.cc @@ -7,6 +7,7 @@ #include <sstream> #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" diff --git a/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc index 5a74e7d..da288ab 100644 --- a/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/autofill_sync_perf_test.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/sync/test/integration/autofill_helper.h" diff --git a/chrome/browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc index a6bf1b1..e6f04cb 100644 --- a/chrome/browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" diff --git a/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc index ac2a1b5..2d18a8b 100644 --- a/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/sync/test/integration/dictionary_helper.h" #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h" diff --git a/chrome/browser/sync/test/integration/performance/extensions_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/extensions_sync_perf_test.cc index 2ca5852..0951780 100644 --- a/chrome/browser/sync/test/integration/performance/extensions_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/extensions_sync_perf_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "chrome/browser/sync/test/integration/extensions_helper.h" #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h" diff --git a/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc index 4e536ad..634bafd 100644 --- a/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/passwords_sync_perf_test.cc @@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/sync/test/integration/passwords_helper.h" #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" diff --git a/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc index 9aac0b8..21c221f 100644 --- a/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" diff --git a/chrome/browser/sync/test/integration/performance/sync_timing_helper.h b/chrome/browser/sync/test/integration/performance/sync_timing_helper.h index 3130494..10cadcc 100644 --- a/chrome/browser/sync/test/integration/performance/sync_timing_helper.h +++ b/chrome/browser/sync/test/integration/performance/sync_timing_helper.h @@ -5,11 +5,11 @@ #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_PERFORMANCE_SYNC_TIMING_HELPER_H_ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_PERFORMANCE_SYNC_TIMING_HELPER_H_ -#include "base/basictypes.h" - #include <string> #include <vector> +#include "base/macros.h" + namespace base { class TimeDelta; } diff --git a/chrome/browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc index ffed1e8..8e54a8c 100644 --- a/chrome/browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" diff --git a/chrome/browser/sync/test/integration/preferences_helper.cc b/chrome/browser/sync/test/integration/preferences_helper.cc index 50d1306..7cd12fb 100644 --- a/chrome/browser/sync/test/integration/preferences_helper.cc +++ b/chrome/browser/sync/test/integration/preferences_helper.cc @@ -39,7 +39,7 @@ void ChangeIntegerPref(int index, const char* pref_name, int new_value) { GetVerifierPrefs()->SetInteger(pref_name, new_value); } -void ChangeInt64Pref(int index, const char* pref_name, int64 new_value) { +void ChangeInt64Pref(int index, const char* pref_name, int64_t new_value) { GetPrefs(index)->SetInt64(pref_name, new_value); if (test()->use_verifier()) GetVerifierPrefs()->SetInt64(pref_name, new_value); @@ -126,7 +126,7 @@ bool IntegerPrefMatches(const char* pref_name) { } bool Int64PrefMatches(const char* pref_name) { - int64 reference_value; + int64_t reference_value; if (test()->use_verifier()) { reference_value = GetVerifierPrefs()->GetInt64(pref_name); } else { diff --git a/chrome/browser/sync/test/integration/preferences_helper.h b/chrome/browser/sync/test/integration/preferences_helper.h index 2ce9a17..aaa5ad8 100644 --- a/chrome/browser/sync/test/integration/preferences_helper.h +++ b/chrome/browser/sync/test/integration/preferences_helper.h @@ -8,6 +8,8 @@ #include "base/files/file_path.h" #include "base/values.h" +#include <stdint.h> + #include <string> class PrefService; @@ -30,10 +32,10 @@ void ChangeBooleanPref(int index, const char* pref_name); // |verifier| if DisableVerifier() hasn't been called. void ChangeIntegerPref(int index, const char* pref_name, int new_value); -// Changes the value of the int64 preference with name |pref_name| in the +// Changes the value of the int64_t preference with name |pref_name| in the // profile with index |index| to |new_value|. Also changes its value in // |verifier| if DisableVerifier() hasn't been called. -void ChangeInt64Pref(int index, const char* pref_name, int64 new_value); +void ChangeInt64Pref(int index, const char* pref_name, int64_t new_value); // Changes the value of the double preference with name |pref_name| in the // profile with index |index| to |new_value|. Also changes its value in @@ -71,7 +73,7 @@ bool BooleanPrefMatches(const char* pref_name) WARN_UNUSED_RESULT; // hasn't been called. bool IntegerPrefMatches(const char* pref_name) WARN_UNUSED_RESULT; -// Used to verify that the int64 preference with name |pref_name| has the +// Used to verify that the int64_t preference with name |pref_name| has the // same value across all profiles. Also checks |verifier| if DisableVerifier() // hasn't been called. bool Int64PrefMatches(const char* pref_name) WARN_UNUSED_RESULT; diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.h b/chrome/browser/sync/test/integration/profile_sync_service_harness.h index 8a3dba4..d4958b6 100644 --- a/chrome/browser/sync/test/integration/profile_sync_service_harness.h +++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.h @@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/sessions/sync_session_snapshot.h" diff --git a/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc b/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc index 740f8cb..ba5be16 100644 --- a/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc +++ b/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc @@ -4,6 +4,8 @@ #include "chrome/browser/sync/test/integration/quiesce_status_change_checker.h" +#include <stddef.h> + #include "base/format_macros.h" #include "base/scoped_observer.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/sync/test/integration/quiesce_status_change_checker.h b/chrome/browser/sync/test/integration/quiesce_status_change_checker.h index e481227..5983592 100644 --- a/chrome/browser/sync/test/integration/quiesce_status_change_checker.h +++ b/chrome/browser/sync/test/integration/quiesce_status_change_checker.h @@ -7,8 +7,8 @@ #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/time/time.h" #include "chrome/browser/sync/test/integration/status_change_checker.h" diff --git a/chrome/browser/sync/test/integration/retry_verifier.cc b/chrome/browser/sync/test/integration/retry_verifier.cc index 202b1f3..7d82a23 100644 --- a/chrome/browser/sync/test/integration/retry_verifier.cc +++ b/chrome/browser/sync/test/integration/retry_verifier.cc @@ -4,6 +4,8 @@ #include "chrome/browser/sync/test/integration/retry_verifier.h" +#include <string.h> + #include <algorithm> #include "base/logging.h" @@ -13,20 +15,23 @@ namespace { // Given the current delay calculate the minimum and maximum wait times for // the next retry. -DelayInfo CalculateDelay(int64 current_delay) { - int64 backoff_s = std::max(static_cast<int64>(1), current_delay * - syncer::kBackoffRandomizationFactor); +DelayInfo CalculateDelay(int64_t current_delay) { + int64_t backoff_s = + std::max(static_cast<int64_t>(1), + current_delay * syncer::kBackoffRandomizationFactor); DelayInfo delay_info; delay_info.min_delay = backoff_s + (-1 * current_delay/ syncer::kBackoffRandomizationFactor); delay_info.max_delay = backoff_s + current_delay/2; - delay_info.min_delay = std::max(static_cast<int64>(1), - std::min(delay_info.min_delay, syncer::kMaxBackoffSeconds)); + delay_info.min_delay = + std::max(static_cast<int64_t>(1), + std::min(delay_info.min_delay, syncer::kMaxBackoffSeconds)); - delay_info.max_delay = std::max(static_cast<int64>(1), - std::min(delay_info.max_delay, syncer::kMaxBackoffSeconds)); + delay_info.max_delay = + std::max(static_cast<int64_t>(1), + std::min(delay_info.max_delay, syncer::kMaxBackoffSeconds)); return delay_info; } @@ -37,8 +42,8 @@ void FillDelayTable(DelayInfo* delay_table, int count) { DCHECK(count > 1); // We start off with the minimum value of 2 seconds. - delay_table[0].min_delay = static_cast<int64>(2); - delay_table[0].max_delay = static_cast<int64>(2); + delay_table[0].min_delay = static_cast<int64_t>(2); + delay_table[0].max_delay = static_cast<int64_t>(2); for (int i = 1 ; i < count ; ++i) { delay_table[i].min_delay = CalculateDelay(delay_table[i-1].min_delay). diff --git a/chrome/browser/sync/test/integration/retry_verifier.h b/chrome/browser/sync/test/integration/retry_verifier.h index bf7003f..e5ad086 100644 --- a/chrome/browser/sync/test/integration/retry_verifier.h +++ b/chrome/browser/sync/test/integration/retry_verifier.h @@ -5,6 +5,9 @@ #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_RETRY_VERIFIER_H_ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_RETRY_VERIFIER_H_ +#include <stdint.h> + +#include "base/macros.h" #include "base/time/time.h" namespace syncer { @@ -17,8 +20,8 @@ class SyncSessionSnapshot; // place somewhere in this range. The algorithm that calculates the retry wait // time uses rand functions. struct DelayInfo { - int64 min_delay; - int64 max_delay; + int64_t min_delay; + int64_t max_delay; }; // Class to verify retries take place using the exponential backoff algorithm. diff --git a/chrome/browser/sync/test/integration/search_engines_helper.cc b/chrome/browser/sync/test/integration/search_engines_helper.cc index b104851..320b2a6 100644 --- a/chrome/browser/sync/test/integration/search_engines_helper.cc +++ b/chrome/browser/sync/test/integration/search_engines_helper.cc @@ -4,6 +4,8 @@ #include "chrome/browser/sync/test/integration/search_engines_helper.h" +#include <stddef.h> + #include <vector> #include "base/strings/string_util.h" diff --git a/chrome/browser/sync/test/integration/sessions_helper.cc b/chrome/browser/sync/test/integration/sessions_helper.cc index 35489a5..18cdc1b 100644 --- a/chrome/browser/sync/test/integration/sessions_helper.cc +++ b/chrome/browser/sync/test/integration/sessions_helper.cc @@ -4,6 +4,8 @@ #include "chrome/browser/sync/test/integration/sessions_helper.h" +#include <stddef.h> + #include <algorithm> #include "base/bind.h" diff --git a/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc index cd233dc..274c2a1f 100644 --- a/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc @@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> + #include "base/command_line.h" +#include "base/macros.h" #include "chrome/browser/sync/test/integration/apps_helper.h" #include "chrome/browser/sync/test/integration/sync_app_list_helper.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" diff --git a/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc index 92fc27e..2125f89 100644 --- a/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_apps_sync_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/sync/test/integration/apps_helper.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc index 128fa93..61c71c8 100644 --- a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc +++ b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc @@ -5,6 +5,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/location.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" diff --git a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc index 391805d..e7519ea 100644 --- a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" diff --git a/chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc b/chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc index aec1c94..9ea624d 100644 --- a/chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "chrome/browser/sync/test/integration/dictionary_helper.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc b/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc index c5c8f45..c308a88 100644 --- a/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/location.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc b/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc index b8c36fc..a5cda22 100644 --- a/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/sync/test/integration/extensions_helper.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc b/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc index e63e69a..290ce9f 100644 --- a/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_password_manager_setting_migrator_service_sync_test.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/json/json_writer.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_syncable_util.h" #include "chrome/browser/sync/test/integration/password_manager_setting_migrator_helper.h" diff --git a/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc index 9be7c57..6444442 100644 --- a/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "chrome/browser/sync/test/integration/passwords_helper.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc index 3892ba9..c336639 100644 --- a/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "chrome/browser/sync/test/integration/preferences_helper.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc b/chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc index 9f58420..225e326 100644 --- a/chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "chrome/browser/sync/test/integration/search_engines_helper.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc index 2cda830..43666a5 100644 --- a/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sync/test/integration/sessions_helper.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" diff --git a/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc index 2aa0bd3..8bb0048 100644 --- a/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_themes_sync_test.cc @@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" #include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/browser/sync/test/integration/themes_helper.h" diff --git a/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc index 431abfe..8a4ace6 100644 --- a/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_typed_urls_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc b/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc index 69619dd..4461ad6 100644 --- a/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" diff --git a/chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc b/chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc index e11586d..4744fd1 100644 --- a/chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_wifi_credentials_sync_test.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/command_line.h" #include "base/macros.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" diff --git a/chrome/browser/sync/test/integration/sync_app_helper.h b/chrome/browser/sync/test/integration/sync_app_helper.h index c3bac14..71d55e8 100644 --- a/chrome/browser/sync/test/integration/sync_app_helper.h +++ b/chrome/browser/sync/test/integration/sync_app_helper.h @@ -7,7 +7,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/sync/test/integration/sync_app_list_helper.h b/chrome/browser/sync/test/integration/sync_app_list_helper.h index 9e4186a..cd788b25 100644 --- a/chrome/browser/sync/test/integration/sync_app_list_helper.h +++ b/chrome/browser/sync/test/integration/sync_app_list_helper.h @@ -5,9 +5,11 @@ #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_APP_LIST_HELPER_H_ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_APP_LIST_HELPER_H_ +#include <stddef.h> + #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/sync/test/integration/sync_auth_test.cc b/chrome/browser/sync/test/integration/sync_auth_test.cc index 09f75ed..35a2117 100644 --- a/chrome/browser/sync/test/integration/sync_auth_test.cc +++ b/chrome/browser/sync/test/integration/sync_auth_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/threading/platform_thread.h" #include "base/time/time.h" diff --git a/chrome/browser/sync/test/integration/sync_datatype_helper.h b/chrome/browser/sync/test/integration/sync_datatype_helper.h index 8cbf585..770cfc3 100644 --- a/chrome/browser/sync/test/integration/sync_datatype_helper.h +++ b/chrome/browser/sync/test/integration/sync_datatype_helper.h @@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_DATATYPE_HELPER_H_ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_DATATYPE_HELPER_H_ -#include "base/basictypes.h" class SyncTest; diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc index 7af22a9..704f106 100644 --- a/chrome/browser/sync/test/integration/sync_errors_test.cc +++ b/chrome/browser/sync/test/integration/sync_errors_test.cc @@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" #include "base/run_loop.h" +#include "build/build_config.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" #include "chrome/browser/sync/test/integration/passwords_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" diff --git a/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc b/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc index 3b98198..51a07cc 100644 --- a/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc +++ b/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" #include "chrome/browser/sync/test/integration/retry_verifier.h" diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.h b/chrome/browser/sync/test/integration/sync_extension_helper.h index 99dfa08..71b55de 100644 --- a/chrome/browser/sync/test/integration/sync_extension_helper.h +++ b/chrome/browser/sync/test/integration/sync_extension_helper.h @@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/sync/test/integration/sync_extension_installer.h b/chrome/browser/sync/test/integration/sync_extension_installer.h index 5c91cb9..22fbb66 100644 --- a/chrome/browser/sync/test/integration/sync_extension_installer.h +++ b/chrome/browser/sync/test/integration/sync_extension_installer.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_INSTALLER_H_ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_INSTALLER_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index 5a9b48f..a848e12 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -4,6 +4,7 @@ #include "chrome/browser/sync/test/integration/sync_test.h" +#include <stddef.h> #include <stdint.h> #include <limits> @@ -26,6 +27,7 @@ #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/history/history_service_factory.h" diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h index 5061e0b..e8aa940 100644 --- a/chrome/browser/sync/test/integration/sync_test.h +++ b/chrome/browser/sync/test/integration/sync_test.h @@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/process/process.h" diff --git a/chrome/browser/sync/test/integration/themes_helper.h b/chrome/browser/sync/test/integration/themes_helper.h index 9911de1..dce9cbb 100644 --- a/chrome/browser/sync/test/integration/themes_helper.h +++ b/chrome/browser/sync/test/integration/themes_helper.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc index 79cb879..2e707f0 100644 --- a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc @@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> + #include "base/command_line.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc index 8fa681e..650d5bf0 100644 --- a/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_apps_sync_test.cc @@ -2,7 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/bookmark_app_helper.h" diff --git a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc index 6f5064f..d8e9e6ab 100644 --- a/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_autofill_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/sync/test/integration/autofill_helper.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc index 5b52793a..d08e930 100644 --- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc @@ -2,10 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + +#include "base/macros.h" #include "base/rand_util.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/values.h" +#include "build/build_config.h" #include "chrome/browser/policy/profile_policy_connector_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" diff --git a/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc b/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc index 5f9c336..335f61e 100644 --- a/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/sync/test/integration/dictionary_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" diff --git a/chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc b/chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc index 2b2767e..e6d8a98 100644 --- a/chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/apps_helper.h" diff --git a/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc index d1b83db..5dca55b 100644 --- a/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc @@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include "base/macros.h" +#include "build/build_config.h" #include "chrome/browser/sync/test/integration/extensions_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" diff --git a/chrome/browser/sync/test/integration/two_client_password_manager_setting_migrator_service_sync_test.cc b/chrome/browser/sync/test/integration/two_client_password_manager_setting_migrator_service_sync_test.cc index df2a33f..2ddba1d 100644 --- a/chrome/browser/sync/test/integration/two_client_password_manager_setting_migrator_service_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_password_manager_setting_migrator_service_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "chrome/browser/sync/test/integration/password_manager_setting_migrator_helper.h" #include "chrome/browser/sync/test/integration/preferences_helper.h" diff --git a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc index e1b6db0..d7764ba 100644 --- a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc @@ -8,8 +8,10 @@ #include "base/guid.h" #include "base/hash.h" +#include "base/macros.h" #include "base/rand_util.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/sync/test/integration/passwords_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc index dd52c82..cd69ae9 100644 --- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc @@ -5,6 +5,7 @@ #include <string> #include "base/guid.h" +#include "base/macros.h" #include "base/prefs/pref_service.h" #include "base/strings/stringprintf.h" #include "chrome/browser/sync/test/integration/preferences_helper.h" diff --git a/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc b/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc index 0d6f2ff..4a44202 100644 --- a/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" diff --git a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc index 2a48d93..54cadfd 100644 --- a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc @@ -5,7 +5,9 @@ #include <string> #include "base/guid.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sync/test/integration/passwords_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" diff --git a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc index 26e64a7..b0df58c 100644 --- a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/basictypes.h" +#include "base/macros.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" #include "chrome/browser/sync/test/integration/sync_test.h" diff --git a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc index 25e2fa5..09f60cc 100644 --- a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc @@ -2,10 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/guid.h" #include "base/i18n/number_formatting.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" diff --git a/chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc b/chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc index 91b8682..3a9a96a7 100644 --- a/chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> + #include "base/command_line.h" #include "base/macros.h" #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" diff --git a/chrome/browser/sync/test/integration/typed_urls_helper.cc b/chrome/browser/sync/test/integration/typed_urls_helper.cc index 2b865fb..bb7a8f9 100644 --- a/chrome/browser/sync/test/integration/typed_urls_helper.cc +++ b/chrome/browser/sync/test/integration/typed_urls_helper.cc @@ -4,6 +4,8 @@ #include "chrome/browser/sync/test/integration/typed_urls_helper.h" +#include <stddef.h> + #include "base/compiler_specific.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" diff --git a/chrome/browser/sync/test/integration/wifi_credentials_helper.cc b/chrome/browser/sync/test/integration/wifi_credentials_helper.cc index 7472aa1..c9146cb 100644 --- a/chrome/browser/sync/test/integration/wifi_credentials_helper.cc +++ b/chrome/browser/sync/test/integration/wifi_credentials_helper.cc @@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" +#include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" |