| 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" |
| 6 |
| 5 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 6 #include "components/sync_driver/about_sync_util.h" | |
| 7 #include "components/sync_driver/fake_sync_service.h" | 8 #include "components/sync_driver/fake_sync_service.h" |
| 8 #include "components/version_info/version_info.h" | 9 #include "components/version_info/version_info.h" |
| 9 #include "sync/internal_api/public/engine/sync_status.h" | 10 #include "sync/internal_api/public/engine/sync_status.h" |
| 10 #include "testing/gmock/include/gmock/gmock.h" | 11 #include "testing/gmock/include/gmock/gmock.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 12 | 13 |
| 13 using ::testing::NiceMock; | 14 using ::testing::NiceMock; |
| 14 using ::testing::Return; | 15 using ::testing::Return; |
| 15 using ::testing::_; | 16 using ::testing::_; |
| 16 | 17 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 scoped_ptr<base::DictionaryValue> strings( | 49 scoped_ptr<base::DictionaryValue> strings( |
| 49 ConstructAboutInformation(&service, NULL, | 50 ConstructAboutInformation(&service, NULL, |
| 50 version_info::Channel::UNKNOWN)); | 51 version_info::Channel::UNKNOWN)); |
| 51 | 52 |
| 52 EXPECT_TRUE(strings->HasKey("unrecoverable_error_detected")); | 53 EXPECT_TRUE(strings->HasKey("unrecoverable_error_detected")); |
| 53 } | 54 } |
| 54 | 55 |
| 55 } // namespace | 56 } // namespace |
| 56 } // namespace sync_ui_util | 57 } // namespace sync_ui_util |
| 57 } // namespace sync_driver | 58 } // namespace sync_driver |
| OLD | NEW |