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

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

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's comments Created 8 years, 9 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) 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 <vector> 5 #include <vector>
6 6
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" 27 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"
28 #include "chrome/browser/sync/glue/typed_url_model_associator.h" 28 #include "chrome/browser/sync/glue/typed_url_model_associator.h"
29 #include "chrome/browser/sync/internal_api/read_node.h" 29 #include "chrome/browser/sync/internal_api/read_node.h"
30 #include "chrome/browser/sync/internal_api/read_transaction.h" 30 #include "chrome/browser/sync/internal_api/read_transaction.h"
31 #include "chrome/browser/sync/internal_api/write_node.h" 31 #include "chrome/browser/sync/internal_api/write_node.h"
32 #include "chrome/browser/sync/internal_api/write_transaction.h" 32 #include "chrome/browser/sync/internal_api/write_transaction.h"
33 #include "chrome/browser/sync/profile_sync_components_factory.h" 33 #include "chrome/browser/sync/profile_sync_components_factory.h"
34 #include "chrome/browser/sync/profile_sync_components_factory_mock.h" 34 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
35 #include "chrome/browser/sync/profile_sync_service.h" 35 #include "chrome/browser/sync/profile_sync_service.h"
36 #include "chrome/browser/sync/profile_sync_test_util.h" 36 #include "chrome/browser/sync/profile_sync_test_util.h"
37 #include "chrome/browser/sync/syncable/syncable.h"
38 #include "chrome/browser/sync/test/engine/test_id_factory.h"
39 #include "chrome/browser/sync/test_profile_sync_service.h" 37 #include "chrome/browser/sync/test_profile_sync_service.h"
40 #include "chrome/common/chrome_notification_types.h" 38 #include "chrome/common/chrome_notification_types.h"
41 #include "chrome/common/net/gaia/gaia_constants.h" 39 #include "chrome/common/net/gaia/gaia_constants.h"
42 #include "chrome/test/base/profile_mock.h" 40 #include "chrome/test/base/profile_mock.h"
43 #include "chrome/test/base/testing_profile.h" 41 #include "chrome/test/base/testing_profile.h"
44 #include "content/public/browser/notification_service.h" 42 #include "content/public/browser/notification_service.h"
45 #include "googleurl/src/gurl.h" 43 #include "googleurl/src/gurl.h"
46 #include "sync/protocol/typed_url_specifics.pb.h" 44 #include "sync/protocol/typed_url_specifics.pb.h"
45 #include "sync/syncable/syncable.h"
46 #include "sync/test/engine/test_id_factory.h"
47 #include "testing/gmock/include/gmock/gmock.h" 47 #include "testing/gmock/include/gmock/gmock.h"
48 48
49 using base::Time; 49 using base::Time;
50 using base::Thread; 50 using base::Thread;
51 using browser_sync::SyncBackendHost; 51 using browser_sync::SyncBackendHost;
52 using browser_sync::TestIdFactory; 52 using browser_sync::TestIdFactory;
53 using browser_sync::TypedUrlChangeProcessor; 53 using browser_sync::TypedUrlChangeProcessor;
54 using browser_sync::TypedUrlDataTypeController; 54 using browser_sync::TypedUrlDataTypeController;
55 using browser_sync::TypedUrlModelAssociator; 55 using browser_sync::TypedUrlModelAssociator;
56 using browser_sync::UnrecoverableErrorHandler; 56 using browser_sync::UnrecoverableErrorHandler;
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 777
778 EXPECT_CALL((*history_backend_.get()), UpdateURL(_, _)). 778 EXPECT_CALL((*history_backend_.get()), UpdateURL(_, _)).
779 WillRepeatedly(Return(false)); 779 WillRepeatedly(Return(false));
780 StartSyncService(base::Bind(&AddTypedUrlEntries, this, sync_entries)); 780 StartSyncService(base::Bind(&AddTypedUrlEntries, this, sync_entries));
781 ASSERT_TRUE( 781 ASSERT_TRUE(
782 service_->failed_datatypes_handler().GetFailedTypes().Has( 782 service_->failed_datatypes_handler().GetFailedTypes().Has(
783 syncable::TYPED_URLS)); 783 syncable::TYPED_URLS));
784 ASSERT_EQ( 784 ASSERT_EQ(
785 1u, service_->failed_datatypes_handler().GetFailedTypes().Size()); 785 1u, service_->failed_datatypes_handler().GetFailedTypes().Size());
786 } 786 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_session_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698