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

Side by Side Diff: chrome/browser/sync/test/integration/sessions_helper.cc

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/test/integration/sessions_helper.h" 5 #include "chrome/browser/sync/test/integration/sessions_helper.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <set> 10 #include <set>
(...skipping 10 matching lines...) Expand all
21 #include "base/time/time.h" 21 #include "base/time/time.h"
22 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/sync/profile_sync_service_factory.h" 23 #include "chrome/browser/sync/profile_sync_service_factory.h"
24 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" 24 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h"
25 #include "chrome/browser/sync/test/integration/multi_client_status_change_checke r.h" 25 #include "chrome/browser/sync/test/integration/multi_client_status_change_checke r.h"
26 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 26 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
27 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" 27 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
28 #include "chrome/browser/sync/test/integration/sync_test.h" 28 #include "chrome/browser/sync/test/integration/sync_test.h"
29 #include "chrome/browser/ui/singleton_tabs.h" 29 #include "chrome/browser/ui/singleton_tabs.h"
30 #include "chrome/common/chrome_switches.h" 30 #include "chrome/common/chrome_switches.h"
31 #include "components/browser_sync/browser/profile_sync_service.h" 31 #include "components/browser_sync/profile_sync_service.h"
32 #include "components/sync/driver/sync_client.h" 32 #include "components/sync/driver/sync_client.h"
33 #include "components/sync_sessions/open_tabs_ui_delegate.h" 33 #include "components/sync_sessions/open_tabs_ui_delegate.h"
34 #include "content/public/test/test_utils.h" 34 #include "content/public/test/test_utils.h"
35 #include "url/gurl.h" 35 #include "url/gurl.h"
36 36
37 using sync_datatype_helper::test; 37 using sync_datatype_helper::test;
38 38
39 namespace sessions_helper { 39 namespace sessions_helper {
40 40
41 ScopedWindowMap::ScopedWindowMap() { 41 ScopedWindowMap::ScopedWindowMap() {
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 return !checker.TimedOut(); 435 return !checker.TimedOut();
436 } 436 }
437 437
438 void DeleteForeignSession(int index, std::string session_tag) { 438 void DeleteForeignSession(int index, std::string session_tag) {
439 ProfileSyncServiceFactory::GetInstance()->GetForProfile( 439 ProfileSyncServiceFactory::GetInstance()->GetForProfile(
440 test()->GetProfile(index))-> 440 test()->GetProfile(index))->
441 GetOpenTabsUIDelegate()->DeleteForeignSession(session_tag); 441 GetOpenTabsUIDelegate()->DeleteForeignSession(session_tag);
442 } 442 }
443 443
444 } // namespace sessions_helper 444 } // namespace sessions_helper
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698