OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/profile_sync_service_harness.h" | 5 #include "chrome/browser/sync/profile_sync_service_harness.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <iterator> | 9 #include <iterator> |
10 #include <ostream> | 10 #include <ostream> |
11 #include <set> | 11 #include <set> |
12 #include <sstream> | 12 #include <sstream> |
13 #include <vector> | 13 #include <vector> |
14 | 14 |
15 #include "base/base64.h" | 15 #include "base/base64.h" |
16 #include "base/compiler_specific.h" | 16 #include "base/compiler_specific.h" |
17 #include "base/json/json_writer.h" | 17 #include "base/json/json_writer.h" |
| 18 #include "base/location.h" |
18 #include "base/logging.h" | 19 #include "base/logging.h" |
19 #include "base/memory/ref_counted.h" | 20 #include "base/memory/ref_counted.h" |
20 #include "base/message_loop.h" | 21 #include "base/message_loop.h" |
21 #include "base/task.h" | 22 #include "base/task.h" |
22 #include "base/tracked.h" | |
23 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
24 #include "chrome/browser/sync/sessions/session_state.h" | 24 #include "chrome/browser/sync/sessions/session_state.h" |
25 #include "chrome/browser/sync/signin_manager.h" | 25 #include "chrome/browser/sync/signin_manager.h" |
26 #include "chrome/browser/sync/sync_ui_util.h" | 26 #include "chrome/browser/sync/sync_ui_util.h" |
27 | 27 |
28 using browser_sync::sessions::SyncSessionSnapshot; | 28 using browser_sync::sessions::SyncSessionSnapshot; |
29 | 29 |
30 // TODO(rsimha): Remove the following lines once crbug.com/91863 is fixed. | 30 // TODO(rsimha): Remove the following lines once crbug.com/91863 is fixed. |
31 // The amount of time for which we wait for a live sync operation to complete. | 31 // The amount of time for which we wait for a live sync operation to complete. |
32 static const int kLiveSyncOperationTimeoutMs = 45000; | 32 static const int kLiveSyncOperationTimeoutMs = 45000; |
(...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1042 return (synced_types.count(type) != 0); | 1042 return (synced_types.count(type) != 0); |
1043 } | 1043 } |
1044 | 1044 |
1045 std::string ProfileSyncServiceHarness::GetServiceStatus() { | 1045 std::string ProfileSyncServiceHarness::GetServiceStatus() { |
1046 DictionaryValue value; | 1046 DictionaryValue value; |
1047 sync_ui_util::ConstructAboutInformation(service_, &value); | 1047 sync_ui_util::ConstructAboutInformation(service_, &value); |
1048 std::string service_status; | 1048 std::string service_status; |
1049 base::JSONWriter::Write(&value, true, &service_status); | 1049 base::JSONWriter::Write(&value, true, &service_status); |
1050 return service_status; | 1050 return service_status; |
1051 } | 1051 } |
OLD | NEW |