chrome/browser/sync/engine/syncer_thread_unittest.cc - Issue 5977010: Move CancellationFlag and WaitableEvent to the synchronization subdirectory....

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/sync/engine/syncer_thread_unittest.cc

Issue 5977010: Move CancellationFlag and WaitableEvent to the synchronization subdirectory.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 11 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

« no previous file with comments | « chrome/browser/sync/engine/syncer_thread.h ('k') | chrome/browser/sync/glue/autofill_data_type_controller.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 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 <list>	5 #include <list>

6 #include <map>	6 #include <map>

7	7

8 #include "base/lock.h"	8 #include "base/lock.h"

9 #include "base/scoped_ptr.h"	9 #include "base/scoped_ptr.h"

10 #include "base/time.h"	10 #include "base/time.h"

11 #include "base/waitable_event.h"	11 #include "base/synchronization/waitable_event.h"

12 #include "chrome/browser/sync/engine/model_safe_worker.h"	12 #include "chrome/browser/sync/engine/model_safe_worker.h"

13 #include "chrome/browser/sync/engine/syncer_thread.h"	13 #include "chrome/browser/sync/engine/syncer_thread.h"

14 #include "chrome/browser/sync/engine/syncer_types.h"	14 #include "chrome/browser/sync/engine/syncer_types.h"

15 #include "chrome/browser/sync/sessions/sync_session_context.h"	15 #include "chrome/browser/sync/sessions/sync_session_context.h"

16 #include "chrome/browser/sync/util/channel.h"	16 #include "chrome/browser/sync/util/channel.h"

17 #include "chrome/test/sync/engine/mock_connection_manager.h"	17 #include "chrome/test/sync/engine/mock_connection_manager.h"

18 #include "chrome/test/sync/engine/test_directory_setter_upper.h"	18 #include "chrome/test/sync/engine/test_directory_setter_upper.h"

19 #include "chrome/test/sync/sessions/test_scoped_session_event_listener.h"	19 #include "chrome/test/sync/sessions/test_scoped_session_event_listener.h"

20 #include "testing/gmock/include/gmock/gmock.h"	20 #include "testing/gmock/include/gmock/gmock.h"

21 #include "testing/gtest/include/gtest/gtest.h"	21 #include "testing/gtest/include/gtest/gtest.h"

(...skipping 1092 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1114 EXPECT_CALL(listener, OnSyncEngineEvent(	1114 EXPECT_CALL(listener, OnSyncEngineEvent(

1115 Field(&SyncEngineEvent::what_happened,	1115 Field(&SyncEngineEvent::what_happened,

1116 SyncEngineEvent::SYNCER_THREAD_EXITING)));	1116 SyncEngineEvent::SYNCER_THREAD_EXITING)));

1117	1117

1118 ASSERT_TRUE(Resume(&listener));	1118 ASSERT_TRUE(Resume(&listener));

1119 ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_));	1119 ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_));

1120 EXPECT_TRUE(syncer_thread()->Stop(2000));	1120 EXPECT_TRUE(syncer_thread()->Stop(2000));

1121 }	1121 }

1122	1122

1123 } // namespace browser_sync	1123 } // namespace browser_sync

OLD	NEW