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

Side by Side Diff: chrome/browser/sync/test/integration/sync_arc_package_helper.cc

Issue 2461463002: [Sync] Replacing NULL with nullptr/null throughout sync code. (Closed)
Patch Set: Reverted PROFILE_nullptr mistake. Created 4 years, 1 month 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "chrome/browser/sync/test/integration/sync_arc_package_helper.h" 5 #include "chrome/browser/sync/test/integration/sync_arc_package_helper.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 } // namespace 50 } // namespace
51 51
52 SyncArcPackageHelper* SyncArcPackageHelper::GetInstance() { 52 SyncArcPackageHelper* SyncArcPackageHelper::GetInstance() {
53 SyncArcPackageHelper* instance = base::Singleton<SyncArcPackageHelper>::get(); 53 SyncArcPackageHelper* instance = base::Singleton<SyncArcPackageHelper>::get();
54 DCHECK(sync_datatype_helper::test()); 54 DCHECK(sync_datatype_helper::test());
55 instance->SetupTest(sync_datatype_helper::test()); 55 instance->SetupTest(sync_datatype_helper::test());
56 return instance; 56 return instance;
57 } 57 }
58 58
59 SyncArcPackageHelper::SyncArcPackageHelper() 59 SyncArcPackageHelper::SyncArcPackageHelper()
60 : test_(NULL), setup_completed_(false), user_manager_enabler_(nullptr) {} 60 : test_(nullptr), setup_completed_(false), user_manager_enabler_(nullptr) {}
61 61
62 SyncArcPackageHelper::~SyncArcPackageHelper() {} 62 SyncArcPackageHelper::~SyncArcPackageHelper() {}
63 63
64 void SyncArcPackageHelper::SetupTest(SyncTest* test) { 64 void SyncArcPackageHelper::SetupTest(SyncTest* test) {
65 if (setup_completed_) { 65 if (setup_completed_) {
66 DCHECK_EQ(test, test_); 66 DCHECK_EQ(test, test_);
67 return; 67 return;
68 } 68 }
69 test_ = test; 69 test_ = test;
70 70
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 if (package1_info->last_backup_android_id != 251 if (package1_info->last_backup_android_id !=
252 package2_info->last_backup_android_id) 252 package2_info->last_backup_android_id)
253 return false; 253 return false;
254 if (package1_info->last_backup_time != package2_info->last_backup_time) 254 if (package1_info->last_backup_time != package2_info->last_backup_time)
255 return false; 255 return false;
256 } 256 }
257 return true; 257 return true;
258 } 258 }
259 259
260 } // namespace arc 260 } // namespace arc
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/sync_app_list_helper.cc ('k') | chrome/browser/sync/test/integration/sync_auth_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698