Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Side by Side Diff: chrome/browser/sync/profile_sync_service_harness.cc

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's comments Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "chrome/browser/sync/profile_sync_service_harness.h" 5 #include "chrome/browser/sync/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 <set> 10 #include <set>
11 #include <sstream> 11 #include <sstream>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/base64.h" 14 #include "base/base64.h"
15 #include "base/bind.h" 15 #include "base/bind.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/location.h"
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/memory/ref_counted.h" 20 #include "base/memory/ref_counted.h"
21 #include "base/message_loop.h" 21 #include "base/message_loop.h"
22 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/signin/signin_manager.h" 23 #include "chrome/browser/signin/signin_manager.h"
24 #include "chrome/browser/sync/glue/data_type_controller.h" 24 #include "chrome/browser/sync/glue/data_type_controller.h"
25 #include "chrome/browser/sync/profile_sync_service_factory.h" 25 #include "chrome/browser/sync/profile_sync_service_factory.h"
26 #include "chrome/browser/sync/sessions/session_state.h"
27 #include "chrome/browser/sync/sync_ui_util.h" 26 #include "chrome/browser/sync/sync_ui_util.h"
27 #include "sync/sessions/session_state.h"
28 28
29 using browser_sync::sessions::SyncSessionSnapshot; 29 using browser_sync::sessions::SyncSessionSnapshot;
30 30
31 // TODO(rsimha): Remove the following lines once crbug.com/91863 is fixed. 31 // TODO(rsimha): Remove the following lines once crbug.com/91863 is fixed.
32 // The amount of time for which we wait for a live sync operation to complete. 32 // The amount of time for which we wait for a live sync operation to complete.
33 static const int kLiveSyncOperationTimeoutMs = 45000; 33 static const int kLiveSyncOperationTimeoutMs = 45000;
34 34
35 // The amount of time we wait for test cases that verify exponential backoff. 35 // The amount of time we wait for test cases that verify exponential backoff.
36 static const int kExponentialBackoffVerificationTimeoutMs = 60000; 36 static const int kExponentialBackoffVerificationTimeoutMs = 60000;
37 37
(...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after
1121 return state_map.size(); 1121 return state_map.size();
1122 } 1122 }
1123 1123
1124 std::string ProfileSyncServiceHarness::GetServiceStatus() { 1124 std::string ProfileSyncServiceHarness::GetServiceStatus() {
1125 DictionaryValue value; 1125 DictionaryValue value;
1126 sync_ui_util::ConstructAboutInformation(service_, &value); 1126 sync_ui_util::ConstructAboutInformation(service_, &value);
1127 std::string service_status; 1127 std::string service_status;
1128 base::JSONWriter::Write(&value, true, &service_status); 1128 base::JSONWriter::Write(&value, true, &service_status);
1129 return service_status; 1129 return service_status;
1130 } 1130 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_harness.h ('k') | chrome/browser/sync/profile_sync_service_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698