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

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

Issue 11886079: Revert 177136 due to memory error on Mac ASAN (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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
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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/compiler_specific.h" 6 #include "base/compiler_specific.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 true)); 243 true));
244 EXPECT_CALL(*factory, CreateDataTypeManager(_, _, _, _)).Times(0); 244 EXPECT_CALL(*factory, CreateDataTypeManager(_, _, _, _)).Times(0);
245 EXPECT_CALL(*factory, CreateBookmarkSyncComponents(_, _)). 245 EXPECT_CALL(*factory, CreateBookmarkSyncComponents(_, _)).
246 Times(0); 246 Times(0);
247 harness_.service->RegisterDataTypeController( 247 harness_.service->RegisterDataTypeController(
248 new BookmarkDataTypeController(harness_.service->factory(), 248 new BookmarkDataTypeController(harness_.service->factory(),
249 harness_.profile.get(), 249 harness_.profile.get(),
250 harness_.service.get())); 250 harness_.service.get()));
251 251
252 harness_.service->Initialize(); 252 harness_.service->Initialize();
253 harness_.service->Shutdown();
254 harness_.service.reset(); 253 harness_.service.reset();
255 } 254 }
256 255
257 TEST_F(ProfileSyncServiceTest, DisableAndEnableSyncTemporarily) { 256 TEST_F(ProfileSyncServiceTest, DisableAndEnableSyncTemporarily) {
258 SigninManager* signin = 257 SigninManager* signin =
259 SigninManagerFactory::GetForProfile(harness_.profile.get()); 258 SigninManagerFactory::GetForProfile(harness_.profile.get());
260 signin->SetAuthenticatedUsername("test"); 259 signin->SetAuthenticatedUsername("test");
261 ProfileSyncComponentsFactoryMock* factory = 260 ProfileSyncComponentsFactoryMock* factory =
262 new ProfileSyncComponentsFactoryMock(); 261 new ProfileSyncComponentsFactoryMock();
263 harness_.service.reset(new TestProfileSyncService( 262 harness_.service.reset(new TestProfileSyncService(
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 namespace syncer { 609 namespace syncer {
611 namespace { 610 namespace {
612 611
613 // ProfileSyncService should behave just like an invalidator. 612 // ProfileSyncService should behave just like an invalidator.
614 INSTANTIATE_TYPED_TEST_CASE_P( 613 INSTANTIATE_TYPED_TEST_CASE_P(
615 ProfileSyncServiceInvalidatorTest, InvalidatorTest, 614 ProfileSyncServiceInvalidatorTest, InvalidatorTest,
616 ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate); 615 ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate);
617 616
618 } // namespace 617 } // namespace
619 } // namespace syncer 618 } // namespace syncer
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_harness.cc ('k') | chrome/browser/sync/sync_global_error.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698