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

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

Issue 687903003: Cleanup: Remove unneeded ui_test_utils.h includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix cros Created 6 years, 1 month 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 <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "base/test/test_timeouts.h" 13 #include "base/test/test_timeouts.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/sync/open_tabs_ui_delegate.h" 16 #include "chrome/browser/sync/open_tabs_ui_delegate.h"
17 #include "chrome/browser/sync/profile_sync_service.h" 17 #include "chrome/browser/sync/profile_sync_service.h"
18 #include "chrome/browser/sync/profile_sync_service_factory.h" 18 #include "chrome/browser/sync/profile_sync_service_factory.h"
19 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" 19 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h"
20 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" 20 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
21 #include "chrome/browser/sync/test/integration/multi_client_status_change_checke r.h" 21 #include "chrome/browser/sync/test/integration/multi_client_status_change_checke r.h"
22 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 22 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
23 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" 23 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
24 #include "chrome/browser/sync/test/integration/sync_test.h" 24 #include "chrome/browser/sync/test/integration/sync_test.h"
25 #include "chrome/browser/ui/singleton_tabs.h" 25 #include "chrome/browser/ui/singleton_tabs.h"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "chrome/test/base/ui_test_utils.h" 27 #include "content/public/test/test_utils.h"
28 #include "url/gurl.h" 28 #include "url/gurl.h"
29 29
30 using sync_datatype_helper::test; 30 using sync_datatype_helper::test;
31 31
32 namespace sessions_helper { 32 namespace sessions_helper {
33 33
34 ScopedWindowMap::ScopedWindowMap() { 34 ScopedWindowMap::ScopedWindowMap() {
35 } 35 }
36 36
37 ScopedWindowMap::ScopedWindowMap(SessionWindowMap* windows) { 37 ScopedWindowMap::ScopedWindowMap(SessionWindowMap* windows) {
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 return !checker.TimedOut(); 403 return !checker.TimedOut();
404 } 404 }
405 405
406 void DeleteForeignSession(int index, std::string session_tag) { 406 void DeleteForeignSession(int index, std::string session_tag) {
407 ProfileSyncServiceFactory::GetInstance()->GetForProfile( 407 ProfileSyncServiceFactory::GetInstance()->GetForProfile(
408 test()->GetProfile(index))-> 408 test()->GetProfile(index))->
409 GetOpenTabsUIDelegate()->DeleteForeignSession(session_tag); 409 GetOpenTabsUIDelegate()->DeleteForeignSession(session_tag);
410 } 410 }
411 411
412 } // namespace sessions_helper 412 } // namespace sessions_helper
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698