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

Side by Side Diff: components/browser_sync/test_profile_sync_service.h

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 (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 #ifndef COMPONENTS_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_ 5 #ifndef COMPONENTS_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
6 #define COMPONENTS_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_ 6 #define COMPONENTS_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "components/browser_sync/profile_sync_service.h" 9 #include "components/browser_sync/profile_sync_service.h"
10 #include "components/sync/base/weak_handle.h" 10 #include "components/sync/base/weak_handle.h"
(...skipping 20 matching lines...) Expand all
31 syncer::UserShare* GetUserShare() const override; 31 syncer::UserShare* GetUserShare() const override;
32 32
33 syncer::TestIdFactory* id_factory(); 33 syncer::TestIdFactory* id_factory();
34 34
35 // Raise visibility to ease testing. 35 // Raise visibility to ease testing.
36 using ProfileSyncService::NotifyObservers; 36 using ProfileSyncService::NotifyObservers;
37 37
38 syncer::SyncPrefs* sync_prefs() { return &sync_prefs_; } 38 syncer::SyncPrefs* sync_prefs() { return &sync_prefs_; }
39 39
40 protected: 40 protected:
41 // Return NULL handle to use in backend initialization to avoid receiving 41 // Return null handle to use in backend initialization to avoid receiving
42 // js messages on UI loop when it's being destroyed, which are not deleted 42 // js messages on UI loop when it's being destroyed, which are not deleted
43 // and cause memory leak in test. 43 // and cause memory leak in test.
44 syncer::WeakHandle<syncer::JsEventHandler> GetJsEventHandler() override; 44 syncer::WeakHandle<syncer::JsEventHandler> GetJsEventHandler() override;
45 45
46 private: 46 private:
47 syncer::TestIdFactory id_factory_; 47 syncer::TestIdFactory id_factory_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(TestProfileSyncService); 49 DISALLOW_COPY_AND_ASSIGN(TestProfileSyncService);
50 }; 50 };
51 51
52 } // namespace browser_sync 52 } // namespace browser_sync
53 53
54 #endif // COMPONENTS_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_ 54 #endif // COMPONENTS_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698