| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 5 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
| 6 | 6 |
| 7 #include <cstddef> | 7 #include <cstddef> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <ostream> | 9 #include <ostream> |
| 10 #include <sstream> | 10 #include <sstream> |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 os << "Sync service not available"; | 458 os << "Sync service not available"; |
| 459 } | 459 } |
| 460 return os.str(); | 460 return os.str(); |
| 461 } | 461 } |
| 462 | 462 |
| 463 bool ProfileSyncServiceHarness::IsTypePreferred(syncer::ModelType type) { | 463 bool ProfileSyncServiceHarness::IsTypePreferred(syncer::ModelType type) { |
| 464 return service()->GetPreferredDataTypes().Has(type); | 464 return service()->GetPreferredDataTypes().Has(type); |
| 465 } | 465 } |
| 466 | 466 |
| 467 std::string ProfileSyncServiceHarness::GetServiceStatus() { | 467 std::string ProfileSyncServiceHarness::GetServiceStatus() { |
| 468 scoped_ptr<base::DictionaryValue> value( | 468 std::unique_ptr<base::DictionaryValue> value( |
| 469 sync_driver::sync_ui_util::ConstructAboutInformation( | 469 sync_driver::sync_ui_util::ConstructAboutInformation( |
| 470 service(), service()->signin(), chrome::GetChannel())); | 470 service(), service()->signin(), chrome::GetChannel())); |
| 471 std::string service_status; | 471 std::string service_status; |
| 472 base::JSONWriter::WriteWithOptions( | 472 base::JSONWriter::WriteWithOptions( |
| 473 *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &service_status); | 473 *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &service_status); |
| 474 return service_status; | 474 return service_status; |
| 475 } | 475 } |
| OLD | NEW |