| Index: chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
|
| diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
|
| index d19610595c3d59eb34cf8cfd91030c41016733fc..e7b0675550bc3431854fd4d9eb927d68564d4b38 100644
|
| --- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
|
| +++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
|
| @@ -2,13 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h"
|
| +
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/bind.h"
|
| #include "base/json/json_writer.h"
|
| #include "base/macros.h"
|
| #include "base/prefs/pref_service.h"
|
| -#include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/test/base/testing_profile.h"
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| @@ -90,11 +92,10 @@ class SupervisedUserSharedSettingsServiceTest : public ::testing::Test {
|
| scoped_ptr<syncer::SyncErrorFactory> error_handler(
|
| new MockSyncErrorFactory(SUPERVISED_USER_SHARED_SETTINGS));
|
| SyncMergeResult result = settings_service_.MergeDataAndStartSyncing(
|
| - SUPERVISED_USER_SHARED_SETTINGS,
|
| - initial_sync_data,
|
| + SUPERVISED_USER_SHARED_SETTINGS, initial_sync_data,
|
| scoped_ptr<SyncChangeProcessor>(
|
| new SyncChangeProcessorWrapperForTest(sync_processor_.get())),
|
| - error_handler.Pass());
|
| + std::move(error_handler));
|
| EXPECT_FALSE(result.error().IsSet());
|
| }
|
|
|
|
|