chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm - Issue 1408643002: [Sync] Componentize synced_tab_delegate

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Limit ui/ DEPS to transition types 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

« no previous file with comments | « chrome/browser/sync/test/integration/sessions_helper.cc ('k') | chrome/browser/ui/sync/browser_synced_window_delegates_getter.h » ('j') | components/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 1a6ae6d72904a151d5d2cbeb2f8a1bf535d28577..c9e5fda0c2584eb93ebe22a7a332764c59070271 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 MockWrenchMenuModel);

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(),