chrome/browser/sync/profile_sync_service_bookmark_unittest.cc - Issue 10534080: sync: move internal_api components used by chrome/browser into internal_api/public

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

Issue 10534080: sync: move internal_api components used by chrome/browser into internal_api/public (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 8 years, 6 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) 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 // 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>

(...skipping 12 matching lines...) Expand all Loading...
23 #include "chrome/browser/bookmarks/bookmark_model.h"	23 #include "chrome/browser/bookmarks/bookmark_model.h"

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

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

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

27 #include "chrome/browser/sync/glue/data_type_error_handler.h"	27 #include "chrome/browser/sync/glue/data_type_error_handler.h"

28 #include "chrome/browser/sync/glue/data_type_error_handler_mock.h"	28 #include "chrome/browser/sync/glue/data_type_error_handler_mock.h"

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

30 #include "chrome/test/base/testing_profile.h"	30 #include "chrome/test/base/testing_profile.h"

31 #include "content/public/test/test_browser_thread.h"	31 #include "content/public/test/test_browser_thread.h"

32 #include "sync/api/sync_error.h"	32 #include "sync/api/sync_error.h"

33 #include "sync/internal_api/change_record.h"	33 #include "sync/internal_api/public/change_record.h"

34 #include "sync/internal_api/read_node.h"	34 #include "sync/internal_api/public/read_node.h"

35 #include "sync/internal_api/read_transaction.h"	35 #include "sync/internal_api/public/read_transaction.h"

36 #include "sync/internal_api/test_user_share.h"	36 #include "sync/internal_api/public/test/test_user_share.h"

37 #include "sync/internal_api/write_node.h"	37 #include "sync/internal_api/public/write_node.h"

38 #include "sync/internal_api/write_transaction.h"	38 #include "sync/internal_api/public/write_transaction.h"

	39 #include "sync/syncable/syncable.h" // TODO(tim): Remove. Bug 131130.

39 #include "sync/test/engine/test_id_factory.h"	40 #include "sync/test/engine/test_id_factory.h"

40 #include "testing/gmock/include/gmock/gmock.h"	41 #include "testing/gmock/include/gmock/gmock.h"

41 #include "testing/gtest/include/gtest/gtest.h"	42 #include "testing/gtest/include/gtest/gtest.h"

42	43

43 namespace browser_sync {	44 namespace browser_sync {

44	45

45 using content::BrowserThread;	46 using content::BrowserThread;

46 using sync_api::BaseNode;	47 using sync_api::BaseNode;

47 using testing::_;	48 using testing::_;

48 using testing::InvokeWithoutArgs;	49 using testing::InvokeWithoutArgs;

(...skipping 1440 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1489 EXPECT_EQ(1, observer.get_started());	1490 EXPECT_EQ(1, observer.get_started());

1490 EXPECT_EQ(0, observer.get_completed_count_at_started());	1491 EXPECT_EQ(0, observer.get_completed_count_at_started());

1491 EXPECT_EQ(1, observer.get_completed());	1492 EXPECT_EQ(1, observer.get_completed());

1492	1493

1493 model_->RemoveObserver(&observer);	1494 model_->RemoveObserver(&observer);

1494 }	1495 }

1495	1496

1496 } // namespace	1497 } // namespace

1497	1498

1498 } // namespace browser_sync	1499 } // namespace browser_sync

OLD	NEW