chrome/browser/sync/profile_sync_service_bookmark_unittest.cc - Issue 7624009: Original patch by rlarocque@chromium.org at http://codereview.chromium.org/7633077/

Side by Side Diff: chrome/browser/sync/profile_sync_service_bookmark_unittest.cc

Issue 7624009: Original patch by rlarocque@chromium.org at http://codereview.chromium.org/7633077/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix windows build pt5 Created 9 years, 4 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/profile_sync_service_autofill_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_password_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 // TODO(akalin): This file is basically just a unit test for	5 // TODO(akalin): This file is basically just a unit test for

6 // BookmarkChangeProcessor. Write unit tests for	6 // BookmarkChangeProcessor. Write unit tests for

7 // BookmarkModelAssociator separately.	7 // BookmarkModelAssociator separately.

8	8

9 #include <stack>	9 #include <stack>

10 #include <vector>	10 #include <vector>

11	11

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/file_path.h"	13 #include "base/file_path.h"

14 #include "base/file_util.h"	14 #include "base/file_util.h"

15 #include "base/memory/scoped_ptr.h"	15 #include "base/memory/scoped_ptr.h"

16 #include "base/message_loop.h"	16 #include "base/message_loop.h"

17 #include "base/string16.h"	17 #include "base/string16.h"

18 #include "base/string_number_conversions.h"	18 #include "base/string_number_conversions.h"

19 #include "base/string_util.h"	19 #include "base/string_util.h"

20 #include "base/tracked.h"	20 #include "base/tracked.h"

21 #include "base/utf_string_conversions.h"	21 #include "base/utf_string_conversions.h"

22 #include "chrome/browser/bookmarks/bookmark_model.h"	22 #include "chrome/browser/bookmarks/bookmark_model.h"

23 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"	23 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"

24 #include "chrome/browser/sync/api/sync_error.h"	24 #include "chrome/browser/sync/api/sync_error.h"

25 #include "chrome/browser/sync/engine/syncapi.h"

26 #include "chrome/browser/sync/glue/bookmark_change_processor.h"	25 #include "chrome/browser/sync/glue/bookmark_change_processor.h"

27 #include "chrome/browser/sync/glue/bookmark_model_associator.h"	26 #include "chrome/browser/sync/glue/bookmark_model_associator.h"

	27 #include "chrome/browser/sync/internal_api/read_node.h"

	28 #include "chrome/browser/sync/internal_api/read_transaction.h"

	29 #include "chrome/browser/sync/internal_api/sync_manager.h"

	30 #include "chrome/browser/sync/internal_api/write_node.h"

	31 #include "chrome/browser/sync/internal_api/write_transaction.h"

28 #include "chrome/browser/sync/syncable/directory_manager.h"	32 #include "chrome/browser/sync/syncable/directory_manager.h"

29 #include "chrome/common/chrome_switches.h"	33 #include "chrome/common/chrome_switches.h"

30 #include "chrome/test/base/testing_browser_process_test.h"	34 #include "chrome/test/base/testing_browser_process_test.h"

31 #include "chrome/test/base/testing_profile.h"	35 #include "chrome/test/base/testing_profile.h"

32 #include "chrome/test/sync/engine/test_id_factory.h"	36 #include "chrome/test/sync/engine/test_id_factory.h"

33 #include "chrome/test/sync/engine/test_user_share.h"	37 #include "chrome/test/sync/engine/test_user_share.h"

34 #include "content/browser/browser_thread.h"	38 #include "content/browser/browser_thread.h"

35 #include "testing/gmock/include/gmock/gmock.h"	39 #include "testing/gmock/include/gmock/gmock.h"

36 #include "testing/gtest/include/gtest/gtest.h"	40 #include "testing/gtest/include/gtest/gtest.h"

37	41

(...skipping 1389 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1427 // Make sure we're back in sync. In real life, the user would need	1431 // Make sure we're back in sync. In real life, the user would need

1428 // to reauthenticate before this happens, but in the test, authentication	1432 // to reauthenticate before this happens, but in the test, authentication

1429 // is sidestepped.	1433 // is sidestepped.

1430 ExpectBookmarkModelMatchesTestData();	1434 ExpectBookmarkModelMatchesTestData();

1431 ExpectModelMatch();	1435 ExpectModelMatch();

1432 }	1436 }

1433	1437

1434 } // namespace	1438 } // namespace

1435	1439

1436 } // namespace browser_sync	1440 } // namespace browser_sync

OLD	NEW