| OLD | NEW |
| 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/about_sync_util.h" | 5 #include "components/sync_driver/about_sync_util.h" |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "components/sync_driver/fake_sync_service.h" | 8 #include "components/sync_driver/fake_sync_service.h" |
| 9 #include "components/version_info/version_info.h" | 9 #include "components/version_info/version_info.h" |
| 10 #include "sync/internal_api/public/engine/sync_status.h" | 10 #include "sync/internal_api/public/engine/sync_status.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 | 37 |
| 38 syncer::sessions::SyncSessionSnapshot GetLastSessionSnapshot() | 38 syncer::sessions::SyncSessionSnapshot GetLastSessionSnapshot() |
| 39 const override { | 39 const override { |
| 40 return syncer::sessions::SyncSessionSnapshot(); | 40 return syncer::sessions::SyncSessionSnapshot(); |
| 41 } | 41 } |
| 42 }; | 42 }; |
| 43 | 43 |
| 44 TEST(SyncUIUtilTestAbout, ConstructAboutInformationWithUnrecoverableErrorTest) { | 44 TEST(SyncUIUtilTestAbout, ConstructAboutInformationWithUnrecoverableErrorTest) { |
| 45 SyncServiceMock service; | 45 SyncServiceMock service; |
| 46 | 46 |
| 47 scoped_ptr<base::DictionaryValue> strings( | 47 std::unique_ptr<base::DictionaryValue> strings(ConstructAboutInformation( |
| 48 ConstructAboutInformation(&service, NULL, | 48 &service, NULL, version_info::Channel::UNKNOWN)); |
| 49 version_info::Channel::UNKNOWN)); | |
| 50 | 49 |
| 51 EXPECT_TRUE(strings->HasKey("unrecoverable_error_detected")); | 50 EXPECT_TRUE(strings->HasKey("unrecoverable_error_detected")); |
| 52 } | 51 } |
| 53 | 52 |
| 54 } // namespace | 53 } // namespace |
| 55 } // namespace sync_ui_util | 54 } // namespace sync_ui_util |
| 56 } // namespace sync_driver | 55 } // namespace sync_driver |
| OLD | NEW |