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

Side by Side Diff: components/sync_driver/glue/ui_model_worker_unittest.cc

Issue 1907683003: Convert //components/sync_driver from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Build fix, address feedback Created 4 years, 8 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) 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 "components/sync_driver/glue/ui_model_worker.h" 5 #include "components/sync_driver/glue/ui_model_worker.h"
6 6
7 #include <memory>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
9 #include "base/callback.h" 11 #include "base/callback.h"
10 #include "base/location.h" 12 #include "base/location.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
15 #include "base/synchronization/waitable_event.h" 16 #include "base/synchronization/waitable_event.h"
16 #include "base/thread_task_runner_handle.h" 17 #include "base/thread_task_runner_handle.h"
17 #include "base/threading/thread.h" 18 #include "base/threading/thread.h"
18 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
19 20
20 using browser_sync::UIModelWorker; 21 using browser_sync::UIModelWorker;
21 using syncer::SyncerError; 22 using syncer::SyncerError;
22 23
23 class UIModelWorkerVisitor { 24 class UIModelWorkerVisitor {
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 72
72 Syncer* syncer() { return syncer_.get(); } 73 Syncer* syncer() { return syncer_.get(); }
73 UIModelWorker* bmw() { return bmw_.get(); } 74 UIModelWorker* bmw() { return bmw_.get(); }
74 base::Thread* core_thread() { return &faux_core_thread_; } 75 base::Thread* core_thread() { return &faux_core_thread_; }
75 base::Thread* syncer_thread() { return &faux_syncer_thread_; } 76 base::Thread* syncer_thread() { return &faux_syncer_thread_; }
76 private: 77 private:
77 base::MessageLoop faux_ui_loop_; 78 base::MessageLoop faux_ui_loop_;
78 base::Thread faux_syncer_thread_; 79 base::Thread faux_syncer_thread_;
79 base::Thread faux_core_thread_; 80 base::Thread faux_core_thread_;
80 scoped_refptr<UIModelWorker> bmw_; 81 scoped_refptr<UIModelWorker> bmw_;
81 scoped_ptr<Syncer> syncer_; 82 std::unique_ptr<Syncer> syncer_;
82 }; 83 };
83 84
84 TEST_F(SyncUIModelWorkerTest, ScheduledWorkRunsOnUILoop) { 85 TEST_F(SyncUIModelWorkerTest, ScheduledWorkRunsOnUILoop) {
85 base::WaitableEvent v_was_run(false, false); 86 base::WaitableEvent v_was_run(false, false);
86 scoped_ptr<UIModelWorkerVisitor> v( 87 std::unique_ptr<UIModelWorkerVisitor> v(
87 new UIModelWorkerVisitor(&v_was_run, true)); 88 new UIModelWorkerVisitor(&v_was_run, true));
88 89
89 syncer_thread()->task_runner()->PostTask( 90 syncer_thread()->task_runner()->PostTask(
90 FROM_HERE, 91 FROM_HERE,
91 base::Bind(&Syncer::SyncShare, base::Unretained(syncer()), v.get())); 92 base::Bind(&Syncer::SyncShare, base::Unretained(syncer()), v.get()));
92 93
93 // We are on the UI thread, so run our loop to process the 94 // We are on the UI thread, so run our loop to process the
94 // (hopefully) scheduled task from a SyncShare invocation. 95 // (hopefully) scheduled task from a SyncShare invocation.
95 base::MessageLoop::current()->Run(); 96 base::MessageLoop::current()->Run();
96 syncer_thread()->Stop(); 97 syncer_thread()->Stop();
97 } 98 }
OLDNEW
« no previous file with comments | « components/sync_driver/glue/sync_backend_registrar_unittest.cc ('k') | components/sync_driver/local_device_info_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698