Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8706)

Unified Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

Issue 1408643002: [Sync] Componentize synced_tab_delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test broken by rebase Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
index bca4e52323055079be97aa135aff3a9b2b9b9578..aa9fdfcf297cd0235510a15fd0f10123b21fc4db 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
@@ -8,6 +8,7 @@
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/sync/sessions/sessions_sync_manager.h"
#include "chrome/browser/ui/browser_list.h"
@@ -25,6 +26,7 @@
#include "chrome/grit/generated_resources.h"
#include "chrome/test/base/testing_profile.h"
#include "components/sync_driver/local_device_info_provider_mock.h"
+#include "components/sync_driver/sync_client.h"
#include "grit/theme_resources.h"
#include "sync/api/fake_sync_change_processor.h"
#include "sync/api/sync_error_factory_mock.h"
@@ -73,12 +75,11 @@ class WrenchMenuControllerTest
fake_model_.reset(new MockAppMenuModel);
manager_.reset(new browser_sync::SessionsSyncManager(
- profile(),
- local_device_.get(),
- scoped_ptr<browser_sync::LocalSessionEventRouter>(
- new DummyRouter()),
- scoped_ptr<browser_sync::SyncedWindowDelegatesGetter>(
- new browser_sync::BrowserSyncedWindowDelegatesGetter())));
+ ProfileSyncServiceFactory::GetForProfile(profile())
+ ->GetSyncClient()
+ ->GetSyncSessionsClient(),
+ profile(), local_device_.get(),
+ scoped_ptr<browser_sync::LocalSessionEventRouter>(new DummyRouter())));
manager_->MergeDataAndStartSyncing(
syncer::SESSIONS,
syncer::SyncDataList(),

Powered by Google App Engine
This is Rietveld 408576698