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: components/search_engines/search_engine_data_type_controller_unittest.cc

Issue 1302233003: Replace gmock's deprecated SetArgumentPointee with SetArgPointee. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2017 Created 3 years, 7 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/search_engines/search_engine_data_type_controller.h" 5 #include "components/search_engines/search_engine_data_type_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/run_loop.h" 14 #include "base/run_loop.h"
15 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
16 #include "base/threading/thread_task_runner_handle.h" 16 #include "base/threading/thread_task_runner_handle.h"
17 #include "base/tracked_objects.h" 17 #include "base/tracked_objects.h"
18 #include "components/search_engines/template_url_service.h" 18 #include "components/search_engines/template_url_service.h"
19 #include "components/sync/driver/data_type_controller_mock.h" 19 #include "components/sync/driver/data_type_controller_mock.h"
20 #include "components/sync/driver/fake_generic_change_processor.h" 20 #include "components/sync/driver/fake_generic_change_processor.h"
21 #include "components/sync/driver/fake_sync_client.h" 21 #include "components/sync/driver/fake_sync_client.h"
22 #include "components/sync/driver/sync_api_component_factory_mock.h" 22 #include "components/sync/driver/sync_api_component_factory_mock.h"
23 #include "components/sync/model/fake_syncable_service.h" 23 #include "components/sync/model/fake_syncable_service.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 25
26 using testing::_; 26 using testing::_;
27 using testing::DoAll; 27 using testing::DoAll;
28 using testing::InvokeWithoutArgs; 28 using testing::InvokeWithoutArgs;
29 using testing::Return; 29 using testing::Return;
30 using testing::SetArgumentPointee; 30 using testing::SetArgPointee;
31 31
32 namespace browser_sync { 32 namespace browser_sync {
33 namespace { 33 namespace {
34 34
35 class SyncSearchEngineDataTypeControllerTest : public testing::Test, 35 class SyncSearchEngineDataTypeControllerTest : public testing::Test,
36 public syncer::FakeSyncClient { 36 public syncer::FakeSyncClient {
37 public: 37 public:
38 SyncSearchEngineDataTypeControllerTest() 38 SyncSearchEngineDataTypeControllerTest()
39 : syncer::FakeSyncClient(&profile_sync_factory_), 39 : syncer::FakeSyncClient(&profile_sync_factory_),
40 template_url_service_(nullptr, 0), 40 template_url_service_(nullptr, 0),
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 EXPECT_FALSE(syncable_service_.syncing()); 174 EXPECT_FALSE(syncable_service_.syncing());
175 search_engine_dtc_.Stop(); 175 search_engine_dtc_.Stop();
176 EXPECT_EQ(NULL, search_engine_dtc_.GetSubscriptionForTesting()); 176 EXPECT_EQ(NULL, search_engine_dtc_.GetSubscriptionForTesting());
177 EXPECT_EQ(syncer::DataTypeController::NOT_RUNNING, 177 EXPECT_EQ(syncer::DataTypeController::NOT_RUNNING,
178 search_engine_dtc_.state()); 178 search_engine_dtc_.state());
179 EXPECT_FALSE(syncable_service_.syncing()); 179 EXPECT_FALSE(syncable_service_.syncing());
180 } 180 }
181 181
182 } // namespace 182 } // namespace
183 } // namespace browser_sync 183 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698