diff options
Diffstat (limited to 'chrome/browser/sync')
4 files changed, 23 insertions, 21 deletions
diff --git a/chrome/browser/sync/glue/chrome_extensions_activity_monitor.cc b/chrome/browser/sync/glue/chrome_extensions_activity_monitor.cc index 1c6d472..7518a83 100644 --- a/chrome/browser/sync/glue/chrome_extensions_activity_monitor.cc +++ b/chrome/browser/sync/glue/chrome_extensions_activity_monitor.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sync/glue/chrome_extensions_activity_monitor.h" #include "base/bind.h" -#include "chrome/browser/extensions/api/bookmarks/bookmark_api.h" +#include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc b/chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc index f03e231..37ddfd6 100644 --- a/chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc +++ b/chrome/browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc @@ -8,7 +8,7 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/values.h" -#include "chrome/browser/extensions/api/bookmarks/bookmark_api.h" +#include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" @@ -86,18 +86,20 @@ class SyncChromeExtensionsActivityMonitorTest : public testing::Test { // 2. Only the mutating events should be recorded by the // syncer::ExtensionsActivityMonitor. TEST_F(SyncChromeExtensionsActivityMonitorTest, Basic) { - FireBookmarksApiEvent<extensions::RemoveBookmarkFunction>(extension1_, 1); - FireBookmarksApiEvent<extensions::MoveBookmarkFunction>(extension1_, 1); - FireBookmarksApiEvent<extensions::UpdateBookmarkFunction>(extension1_, 2); - FireBookmarksApiEvent<extensions::CreateBookmarkFunction>(extension1_, 3); - FireBookmarksApiEvent<extensions::SearchBookmarksFunction>(extension1_, 5); + FireBookmarksApiEvent<extensions::BookmarksRemoveFunction>(extension1_, 1); + FireBookmarksApiEvent<extensions::BookmarksMoveFunction>(extension1_, 1); + FireBookmarksApiEvent<extensions::BookmarksUpdateFunction>(extension1_, 2); + FireBookmarksApiEvent<extensions::BookmarksCreateFunction>(extension1_, 3); + FireBookmarksApiEvent<extensions::BookmarksSearchFunction>(extension1_, 5); const uint32 writes_by_extension1 = 1 + 1 + 2 + 3; - FireBookmarksApiEvent<extensions::RemoveTreeBookmarkFunction>(extension2_, 8); - FireBookmarksApiEvent<extensions::GetBookmarkTreeFunction>(extension2_, 13); - FireBookmarksApiEvent<extensions::GetBookmarkChildrenFunction>( + FireBookmarksApiEvent<extensions::BookmarksRemoveTreeFunction>( + extension2_, 8); + FireBookmarksApiEvent<extensions::BookmarksGetSubTreeFunction>( + extension2_, 13); + FireBookmarksApiEvent<extensions::BookmarksGetChildrenFunction>( extension2_, 21); - FireBookmarksApiEvent<extensions::GetBookmarksFunction>(extension2_, 33); + FireBookmarksApiEvent<extensions::BookmarksGetTreeFunction>(extension2_, 33); const uint32 writes_by_extension2 = 8; syncer::ExtensionsActivityMonitor::Records results; @@ -115,8 +117,8 @@ TEST_F(SyncChromeExtensionsActivityMonitorTest, Basic) { // and put the old records back. Those should be merged with the new // records correctly. TEST_F(SyncChromeExtensionsActivityMonitorTest, Put) { - FireBookmarksApiEvent<extensions::CreateBookmarkFunction>(extension1_, 5); - FireBookmarksApiEvent<extensions::MoveBookmarkFunction>(extension2_, 8); + FireBookmarksApiEvent<extensions::BookmarksCreateFunction>(extension1_, 5); + FireBookmarksApiEvent<extensions::BookmarksMoveFunction>(extension2_, 8); syncer::ExtensionsActivityMonitor::Records results; monitor_.GetAndClearRecords(&results); @@ -125,8 +127,8 @@ TEST_F(SyncChromeExtensionsActivityMonitorTest, Put) { EXPECT_EQ(5U, results[id1_].bookmark_write_count); EXPECT_EQ(8U, results[id2_].bookmark_write_count); - FireBookmarksApiEvent<extensions::GetBookmarksFunction>(extension2_, 3); - FireBookmarksApiEvent<extensions::UpdateBookmarkFunction>(extension2_, 2); + FireBookmarksApiEvent<extensions::BookmarksGetTreeFunction>(extension2_, 3); + FireBookmarksApiEvent<extensions::BookmarksUpdateFunction>(extension2_, 2); // Simulate a commit failure, which augments the active record set with the // refugee records. @@ -145,7 +147,7 @@ TEST_F(SyncChromeExtensionsActivityMonitorTest, Put) { // times. The mintor should correctly clear its records every time // they're returned. TEST_F(SyncChromeExtensionsActivityMonitorTest, MultiGet) { - FireBookmarksApiEvent<extensions::CreateBookmarkFunction>(extension1_, 5); + FireBookmarksApiEvent<extensions::BookmarksCreateFunction>(extension1_, 5); syncer::ExtensionsActivityMonitor::Records results; monitor_.GetAndClearRecords(&results); @@ -156,7 +158,7 @@ TEST_F(SyncChromeExtensionsActivityMonitorTest, MultiGet) { monitor_.GetAndClearRecords(&results); EXPECT_TRUE(results.empty()); - FireBookmarksApiEvent<extensions::CreateBookmarkFunction>(extension1_, 3); + FireBookmarksApiEvent<extensions::BookmarksCreateFunction>(extension1_, 3); monitor_.GetAndClearRecords(&results); EXPECT_EQ(1U, results.size()); diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc index a9d9a52..acdefba 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc @@ -5,11 +5,11 @@ #include "base/command_line.h" #include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" +#include "chrome/browser/extensions/api/storage/settings_frontend.h" #include "chrome/browser/extensions/app_notification_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_system_factory.h" -#include "chrome/browser/extensions/settings/settings_frontend.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/prefs/pref_model_associator.h" @@ -46,8 +46,8 @@ #include "chrome/browser/sync/glue/ui_data_type_controller.h" #include "chrome/browser/sync/profile_sync_components_factory_impl.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/themes/theme_service.h" +#include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/themes/theme_syncable_service.h" #include "chrome/browser/webdata/autocomplete_syncable_service.h" #include "chrome/browser/webdata/autofill_profile_syncable_service.h" diff --git a/chrome/browser/sync/test/integration/extension_settings_helper.cc b/chrome/browser/sync/test/integration/extension_settings_helper.cc index 5c42b95..be57a4a 100644 --- a/chrome/browser/sync/test/integration/extension_settings_helper.cc +++ b/chrome/browser/sync/test/integration/extension_settings_helper.cc @@ -6,12 +6,12 @@ #include "base/bind.h" #include "base/json/json_writer.h" -#include "base/memory/scoped_ptr.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/synchronization/waitable_event.h" #include "base/values.h" +#include "chrome/browser/extensions/api/storage/settings_frontend.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/settings/settings_frontend.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/extensions_helper.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" |