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/engine/sync_status.h" |
8 #include "components/sync_driver/fake_sync_service.h" | 9 #include "components/sync_driver/fake_sync_service.h" |
9 #include "components/version_info/version_info.h" | 10 #include "components/version_info/version_info.h" |
10 #include "sync/internal_api/public/engine/sync_status.h" | |
11 #include "testing/gmock/include/gmock/gmock.h" | 11 #include "testing/gmock/include/gmock/gmock.h" |
12 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
13 | 13 |
14 using ::testing::NiceMock; | 14 using ::testing::NiceMock; |
15 using ::testing::Return; | 15 using ::testing::Return; |
16 using ::testing::_; | 16 using ::testing::_; |
17 | 17 |
18 namespace sync_driver { | 18 namespace sync_driver { |
19 namespace sync_ui_util { | 19 namespace sync_ui_util { |
20 namespace { | 20 namespace { |
(...skipping 25 matching lines...) Expand all Loading... |
46 | 46 |
47 std::unique_ptr<base::DictionaryValue> strings(ConstructAboutInformation( | 47 std::unique_ptr<base::DictionaryValue> strings(ConstructAboutInformation( |
48 &service, NULL, version_info::Channel::UNKNOWN)); | 48 &service, NULL, version_info::Channel::UNKNOWN)); |
49 | 49 |
50 EXPECT_TRUE(strings->HasKey("unrecoverable_error_detected")); | 50 EXPECT_TRUE(strings->HasKey("unrecoverable_error_detected")); |
51 } | 51 } |
52 | 52 |
53 } // namespace | 53 } // namespace |
54 } // namespace sync_ui_util | 54 } // namespace sync_ui_util |
55 } // namespace sync_driver | 55 } // namespace sync_driver |
OLD | NEW |