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

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

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 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
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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 <stddef.h>
6
5 #include "base/command_line.h" 7 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "build/build_config.h"
7 #include "chrome/browser/sync/profile_sync_service_factory.h" 10 #include "chrome/browser/sync/profile_sync_service_factory.h"
8 #include "chrome/test/base/testing_profile.h" 11 #include "chrome/test/base/testing_profile.h"
9 #include "components/browser_sync/browser/profile_sync_service.h" 12 #include "components/browser_sync/browser/profile_sync_service.h"
10 #include "components/browser_sync/common/browser_sync_switches.h" 13 #include "components/browser_sync/common/browser_sync_switches.h"
11 #include "components/sync_driver/data_type_controller.h" 14 #include "components/sync_driver/data_type_controller.h"
12 #include "content/public/test/test_browser_thread_bundle.h" 15 #include "content/public/test/test_browser_thread_bundle.h"
13 #include "sync/internal_api/public/base/model_type.h" 16 #include "sync/internal_api/public/base/model_type.h"
14 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/app_list/app_list_switches.h" 18 #include "ui/app_list/app_list_switches.h"
16 19
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 syncer::ModelTypeSet disabled_types(syncer::AUTOFILL_PROFILE, 136 syncer::ModelTypeSet disabled_types(syncer::AUTOFILL_PROFILE,
134 syncer::BOOKMARKS); 137 syncer::BOOKMARKS);
135 SetDisabledTypes(disabled_types); 138 SetDisabledTypes(disabled_types);
136 ProfileSyncService* pss = ProfileSyncServiceFactory::GetForProfile(profile()); 139 ProfileSyncService* pss = ProfileSyncServiceFactory::GetForProfile(profile());
137 DataTypeController::StateMap controller_states; 140 DataTypeController::StateMap controller_states;
138 pss->GetDataTypeControllerStates(&controller_states); 141 pss->GetDataTypeControllerStates(&controller_states);
139 EXPECT_EQ(DefaultDatatypesCount() - disabled_types.Size(), 142 EXPECT_EQ(DefaultDatatypesCount() - disabled_types.Size(),
140 controller_states.size()); 143 controller_states.size());
141 CheckDefaultDatatypesInMapExcept(&controller_states, disabled_types); 144 CheckDefaultDatatypesInMapExcept(&controller_states, disabled_types);
142 } 145 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_factory.cc ('k') | chrome/browser/sync/profile_sync_service_startup_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698