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

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

Issue 7841007: Rename browser/sync/test/live_sync directory to browser/sync/test/integration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "" Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/live_sync/sessions_helper.h" 5 #include "chrome/browser/sync/test/integration/sessions_helper.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "base/test/test_timeouts.h" 8 #include "base/test/test_timeouts.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/sync/profile_sync_service.h" 11 #include "chrome/browser/sync/profile_sync_service.h"
12 #include "chrome/browser/sync/profile_sync_service_harness.h" 12 #include "chrome/browser/sync/profile_sync_service_harness.h"
13 #include "chrome/browser/sync/glue/session_model_associator.h" 13 #include "chrome/browser/sync/glue/session_model_associator.h"
14 #include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h" 14 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
15 #include "chrome/browser/sync/test/live_sync/live_sync_test.h" 15 #include "chrome/browser/sync/test/integration/sync_test.h"
16 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 16 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/browser/browser_thread.h" 18 #include "content/browser/browser_thread.h"
19 #include "content/browser/tab_contents/tab_contents.h" 19 #include "content/browser/tab_contents/tab_contents.h"
20 #include "googleurl/src/gurl.h" 20 #include "googleurl/src/gurl.h"
21 21
22 using sync_datatype_helper::test; 22 using sync_datatype_helper::test;
23 23
24 namespace sessions_helper { 24 namespace sessions_helper {
25 25
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 if (window_index == index) 285 if (window_index == index)
286 window_index++; // Skip self. 286 window_index++; // Skip self.
287 if (!WindowsMatch(sessions[j]->windows, *windows[window_index])) 287 if (!WindowsMatch(sessions[j]->windows, *windows[window_index]))
288 return false; 288 return false;
289 } 289 }
290 290
291 return true; 291 return true;
292 } 292 }
293 293
294 } // namespace sessions_helper 294 } // namespace sessions_helper
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698