summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/automation/testing_automation_provider.cc66
-rw-r--r--chrome/browser/sync/glue/sync_backend_host.cc5
-rw-r--r--chrome/browser/sync/glue/sync_backend_host.h2
-rw-r--r--chrome/browser/sync/internal_api/all_status.cc23
-rw-r--r--chrome/browser/sync/internal_api/all_status.h3
-rw-r--r--chrome/browser/sync/internal_api/sync_manager.cc7
-rw-r--r--chrome/browser/sync/internal_api/sync_manager.h31
-rw-r--r--chrome/browser/sync/profile_sync_service.cc37
-rw-r--r--chrome/browser/sync/profile_sync_service.h6
-rw-r--r--chrome/browser/sync/sync_ui_util.cc6
-rw-r--r--chrome/browser/sync/sync_ui_util_unittest.cc10
-rw-r--r--chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc6
-rw-r--r--chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc2
-rwxr-xr-xchrome/test/functional/sync.py3
-rw-r--r--chrome/test/functional/test_utils.py2
15 files changed, 35 insertions, 174 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 2b6240a..d2dfbdb 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -5125,7 +5125,6 @@ void TestingAutomationProvider::SignInToSync(Browser* browser,
// {u'summary': u'SYNC DISABLED'}
//
// { u'last synced': u'Just now',
-// u'summary': u'READY',
// u'sync url': u'clients4.google.com',
// u'updates received': 42,
// u'synced datatypes': [ u'Bookmarks',
@@ -5150,8 +5149,6 @@ void TestingAutomationProvider::GetSyncInfo(Browser* browser,
} else {
ProfileSyncService* service = sync_waiter_->service();
ProfileSyncService::Status status = sync_waiter_->GetStatus();
- sync_info->SetString("summary",
- ProfileSyncService::BuildSyncStatusSummaryText(status.summary));
sync_info->SetString("sync url", service->sync_service_url().host());
sync_info->SetString("last synced", service->GetLastSyncedTimeString());
sync_info->SetInteger("updates received", status.updates_received);
@@ -5200,18 +5197,9 @@ void TestingAutomationProvider::AwaitFullSyncCompletion(
reply.SendError("Sync cycle did not complete.");
return;
}
- ProfileSyncService::Status status = sync_waiter_->GetStatus();
- if (status.summary == ProfileSyncService::Status::READY) {
- scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
- return_value->SetBoolean("success", true);
- reply.SendSuccess(return_value.get());
- } else {
- std::string error_msg = "Wait for sync cycle was unsuccessful. "
- "Sync status: ";
- error_msg.append(
- ProfileSyncService::BuildSyncStatusSummaryText(status.summary));
- reply.SendError(error_msg);
- }
+ scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
+ return_value->SetBoolean("success", true);
+ reply.SendSuccess(return_value.get());
}
// Sample json output: { "success": true }
@@ -5237,18 +5225,9 @@ void TestingAutomationProvider::AwaitSyncRestart(
reply.SendError("Sync did not successfully restart.");
return;
}
- ProfileSyncService::Status status = sync_waiter_->GetStatus();
- if (status.summary == ProfileSyncService::Status::READY) {
- scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
- return_value->SetBoolean("success", true);
- reply.SendSuccess(return_value.get());
- } else {
- std::string error_msg = "Wait for sync restart was unsuccessful. "
- "Sync status: ";
- error_msg.append(
- ProfileSyncService::BuildSyncStatusSummaryText(status.summary));
- reply.SendError(error_msg);
- }
+ scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
+ return_value->SetBoolean("success", true);
+ reply.SendSuccess(return_value.get());
}
// Refer to EnableSyncForDatatypes() in chrome/test/pyautolib/pyauto.py for
@@ -5292,15 +5271,9 @@ void TestingAutomationProvider::EnableSyncForDatatypes(
"Enabling datatype: %s", datatype_string.c_str()));
}
}
- ProfileSyncService::Status status = sync_waiter_->GetStatus();
- if (status.summary == ProfileSyncService::Status::READY ||
- status.summary == ProfileSyncService::Status::SYNCING) {
- scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
- return_value->SetBoolean("success", true);
- reply.SendSuccess(return_value.get());
- } else {
- reply.SendError("Enabling sync for given datatypes was unsuccessful");
- }
+ scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
+ return_value->SetBoolean("success", true);
+ reply.SendSuccess(return_value.get());
}
// Refer to DisableSyncForDatatypes() in chrome/test/pyautolib/pyauto.py for
@@ -5330,15 +5303,6 @@ void TestingAutomationProvider::DisableSyncForDatatypes(
}
if (first_datatype == "All") {
sync_waiter_->DisableSyncForAllDatatypes();
- ProfileSyncService::Status status = sync_waiter_->GetStatus();
- if (status.summary != ProfileSyncService::Status::READY &&
- status.summary != ProfileSyncService::Status::SYNCING) {
- scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
- return_value->SetBoolean("success", true);
- reply.SendSuccess(return_value.get());
- } else {
- reply.SendError("Disabling all sync datatypes was unsuccessful");
- }
} else {
int num_datatypes = datatypes->GetSize();
for (int i = 0; i < num_datatypes; i++) {
@@ -5355,15 +5319,9 @@ void TestingAutomationProvider::DisableSyncForDatatypes(
sync_waiter_->AwaitFullSyncCompletion(StringPrintf(
"Disabling datatype: %s", datatype_string.c_str()));
}
- ProfileSyncService::Status status = sync_waiter_->GetStatus();
- if (status.summary == ProfileSyncService::Status::READY ||
- status.summary == ProfileSyncService::Status::SYNCING) {
- scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
- return_value->SetBoolean("success", true);
- reply.SendSuccess(return_value.get());
- } else {
- reply.SendError("Disabling sync for given datatypes was unsuccessful");
- }
+ scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
+ return_value->SetBoolean("success", true);
+ reply.SendSuccess(return_value.get());
}
}
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index bddabe5..c75ffe9 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -602,11 +602,6 @@ SyncBackendHost::Status SyncBackendHost::GetDetailedStatus() {
return core_->sync_manager()->GetDetailedStatus();
}
-SyncBackendHost::StatusSummary SyncBackendHost::GetStatusSummary() {
- DCHECK(initialized());
- return core_->sync_manager()->GetStatusSummary();
-}
-
const SyncSessionSnapshot* SyncBackendHost::GetLastSessionSnapshot() const {
return last_snapshot_.get();
}
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
index ff65cbf..7320a1c 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -144,7 +144,6 @@ class SyncFrontend {
// that the SyncFrontend is only accessed on the UI loop.
class SyncBackendHost : public BackendDataTypeConfigurer {
public:
- typedef sync_api::SyncManager::Status::Summary StatusSummary;
typedef sync_api::SyncManager::Status Status;
// Create a SyncBackendHost with a reference to the |frontend| that
@@ -256,7 +255,6 @@ class SyncBackendHost : public BackendDataTypeConfigurer {
// Called from any thread to obtain current status information in detailed or
// summarized form.
Status GetDetailedStatus();
- StatusSummary GetStatusSummary();
const sessions::SyncSessionSnapshot* GetLastSessionSnapshot() const;
// Determines if the underlying sync engine has made any local changes to
diff --git a/chrome/browser/sync/internal_api/all_status.cc b/chrome/browser/sync/internal_api/all_status.cc
index 6f0edb7..23c1ecb 100644
--- a/chrome/browser/sync/internal_api/all_status.cc
+++ b/chrome/browser/sync/internal_api/all_status.cc
@@ -16,7 +16,6 @@
namespace browser_sync {
AllStatus::AllStatus() {
- status_.summary = sync_api::SyncManager::Status::OFFLINE;
status_.initial_sync_ended = true;
status_.notifications_enabled = false;
status_.cryptographer_ready = false;
@@ -96,27 +95,6 @@ sync_api::SyncManager::Status AllStatus::CalcSyncing(
return status;
}
-void AllStatus::CalcStatusChanges() {
- const bool unsynced_changes = status_.unsynced_count > 0;
- // TODO(rlarocque): Hard-coding online to true is a hack that patches over
- // crbug.com/112229, and limits the fallout from some ServerConnectionManager
- // changes. We will be making more drastic changes to the summary value in
- // the near future. See crbug.com/98346.
- const bool online = true;
- if (online) {
- if (status_.syncing)
- status_.summary = sync_api::SyncManager::Status::SYNCING;
- else
- status_.summary = sync_api::SyncManager::Status::READY;
- } else if (!status_.initial_sync_ended) {
- status_.summary = sync_api::SyncManager::Status::OFFLINE_UNUSABLE;
- } else if (unsynced_changes) {
- status_.summary = sync_api::SyncManager::Status::OFFLINE_UNSYNCED;
- } else {
- status_.summary = sync_api::SyncManager::Status::OFFLINE;
- }
-}
-
void AllStatus::OnSyncEngineEvent(const SyncEngineEvent& event) {
ScopedStatusLock lock(this);
switch (event.what_happened) {
@@ -181,7 +159,6 @@ ScopedStatusLock::ScopedStatusLock(AllStatus* allstatus)
}
ScopedStatusLock::~ScopedStatusLock() {
- allstatus_->CalcStatusChanges();
allstatus_->mutex_.Release();
}
diff --git a/chrome/browser/sync/internal_api/all_status.h b/chrome/browser/sync/internal_api/all_status.h
index 1758acb..7cea022 100644
--- a/chrome/browser/sync/internal_api/all_status.h
+++ b/chrome/browser/sync/internal_api/all_status.h
@@ -62,9 +62,6 @@ class AllStatus : public SyncEngineEventListener {
sync_api::SyncManager::Status CalcSyncing(const SyncEngineEvent& event) const;
sync_api::SyncManager::Status CreateBlankStatus() const;
- // Examines status to see what has changed, updates old_status in place.
- void CalcStatusChanges();
-
sync_api::SyncManager::Status status_;
mutable base::Lock mutex_; // Protects all data members.
diff --git a/chrome/browser/sync/internal_api/sync_manager.cc b/chrome/browser/sync/internal_api/sync_manager.cc
index a1eb181..14b37fd 100644
--- a/chrome/browser/sync/internal_api/sync_manager.cc
+++ b/chrome/browser/sync/internal_api/sync_manager.cc
@@ -692,8 +692,7 @@ SyncManager::SyncManager(const std::string& name)
: data_(new SyncInternal(name)) {}
SyncManager::Status::Status()
- : summary(INVALID),
- notifications_enabled(false),
+ : notifications_enabled(false),
notifications_received(0),
unsynced_count(0),
encryption_conflicts(0),
@@ -2370,10 +2369,6 @@ void SyncManager::SyncInternal::RemoveObserver(
observers_.RemoveObserver(observer);
}
-SyncManager::Status::Summary SyncManager::GetStatusSummary() const {
- return data_->GetStatus().summary;
-}
-
SyncManager::Status SyncManager::GetDetailedStatus() const {
return data_->GetStatus();
}
diff --git a/chrome/browser/sync/internal_api/sync_manager.h b/chrome/browser/sync/internal_api/sync_manager.h
index 31797e3..c9d45b8 100644
--- a/chrome/browser/sync/internal_api/sync_manager.h
+++ b/chrome/browser/sync/internal_api/sync_manager.h
@@ -95,35 +95,9 @@ class SyncManager {
// Status encapsulates detailed state about the internals of the SyncManager.
struct Status {
- // Summary is a distilled set of important information that the end-user may
- // wish to be informed about (through UI, for example). Note that if a
- // summary state requires user interaction (such as auth failures), more
- // detailed information may be contained in additional status fields.
- enum Summary {
- // The internal instance is in an unrecognizable state. This should not
- // happen.
- INVALID = 0,
- // Can't connect to server, but there are no pending changes in
- // our local cache.
- OFFLINE,
- // Can't connect to server, and there are pending changes in our
- // local cache.
- OFFLINE_UNSYNCED,
- // Connected and syncing.
- SYNCING,
- // Connected, no pending changes.
- READY,
- // Can't connect to server, and we haven't completed the initial
- // sync yet. So there's nothing we can do but wait for the server.
- OFFLINE_UNUSABLE,
-
- SUMMARY_STATUS_COUNT,
- };
-
Status();
~Status();
- Summary summary;
bool notifications_enabled; // True only if subscribed for notifications.
// Notifications counters updated by the actions in synapi.
@@ -559,10 +533,7 @@ class SyncManager {
// potentially dereference garbage.
void RemoveObserver(Observer* observer);
- // Status-related getters. Typically GetStatusSummary will suffice, but
- // GetDetailedSyncStatus can be useful for gathering debug-level details of
- // the internals of the sync engine. May be called on any thread.
- Status::Summary GetStatusSummary() const;
+ // Status-related getter. May be called on any thread.
Status GetDetailedStatus() const;
// Whether or not the Nigori node is encrypted using an explicit passphrase.
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index e0451b0..0444247 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -1063,11 +1063,22 @@ void ProfileSyncService::ShowSyncSetupWithWizard(SyncSetupWizard::State state) {
ShowSyncSetup(chrome::kSyncSetupSubPage);
}
-SyncBackendHost::StatusSummary ProfileSyncService::QuerySyncStatusSummary() {
- if (backend_.get() && backend_initialized_)
- return backend_->GetStatusSummary();
- else
- return SyncBackendHost::Status::OFFLINE_UNUSABLE;
+std::string ProfileSyncService::QuerySyncStatusSummary() {
+ if (unrecoverable_error_detected_) {
+ return "Unrecoverable error detected";
+ } else if (!backend_.get()) {
+ return "Syncing not enabled";
+ } else if (backend_.get() && !HasSyncSetupCompleted()) {
+ return "First time sync setup incomplete";
+ } else if (backend_.get() && HasSyncSetupCompleted() &&
+ data_type_manager_.get() &&
+ data_type_manager_->state() != DataTypeManager::CONFIGURED) {
+ return "Datatypes not fully initialized";
+ } else if (ShouldPushChanges()) {
+ return "Sync service initialized";
+ } else {
+ return "Status unknown: Internal error?";
+ }
}
SyncBackendHost::Status ProfileSyncService::QueryDetailedSyncStatus() {
@@ -1075,7 +1086,6 @@ SyncBackendHost::Status ProfileSyncService::QueryDetailedSyncStatus() {
return backend_->GetDetailedStatus();
} else {
SyncBackendHost::Status status;
- status.summary = SyncBackendHost::Status::OFFLINE_UNUSABLE;
status.sync_protocol_error = last_actionable_error_;
return status;
}
@@ -1089,21 +1099,6 @@ bool ProfileSyncService::SetupInProgress() const {
return !HasSyncSetupCompleted() && WizardIsVisible();
}
-std::string ProfileSyncService::BuildSyncStatusSummaryText(
- const sync_api::SyncManager::Status::Summary& summary) {
- const char* strings[] = {"INVALID", "OFFLINE", "OFFLINE_UNSYNCED", "SYNCING",
- "READY", "OFFLINE_UNUSABLE"};
- COMPILE_ASSERT(arraysize(strings) ==
- sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT,
- enum_indexed_array);
- if (summary < 0 ||
- summary >= sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT) {
- LOG(DFATAL) << "Illegal Summary Value: " << summary;
- return "UNKNOWN";
- }
- return strings[summary];
-}
-
bool ProfileSyncService::sync_initialized() const {
return backend_initialized_;
}
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 273d9c9..b4b0a51 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -259,7 +259,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
virtual void OnUserCancelledDialog();
// Get various information for displaying in the user interface.
- browser_sync::SyncBackendHost::StatusSummary QuerySyncStatusSummary();
+ std::string QuerySyncStatusSummary();
virtual browser_sync::SyncBackendHost::Status QueryDetailedSyncStatus();
virtual const GoogleServiceAuthError& GetAuthError() const;
@@ -290,10 +290,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
virtual void ShowSyncSetup(const std::string& sub_page);
void ShowSyncSetupWithWizard(SyncSetupWizard::State state);
- // Pretty-printed strings for a given StatusSummary.
- static std::string BuildSyncStatusSummaryText(
- const browser_sync::SyncBackendHost::StatusSummary& summary);
-
// Returns true if the SyncBackendHost has told us it's ready to accept
// changes.
// [REMARK] - it is safe to call this function only from the ui thread.
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc
index e66d1e6..b63e59f 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -501,15 +501,13 @@ void ConstructAboutInformation(ProfileSyncService* service,
DictionaryValue* strings) {
CHECK(strings);
if (!service) {
- strings->SetString("summary", "SYNC DISABLED");
+ strings->SetString("summary", "Sync service does not exist");
} else {
sync_api::SyncManager::Status full_status(
service->QueryDetailedSyncStatus());
strings->SetString("service_url", service->sync_service_url().spec());
- strings->SetString("summary",
- ProfileSyncService::BuildSyncStatusSummaryText(
- full_status.summary));
+ strings->SetString("summary", service->QuerySyncStatusSummary());
strings->SetString("version", GetVersionString());
strings->SetString("auth_problem",
diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc
index 2cb84c4..801ad32 100644
--- a/chrome/browser/sync/sync_ui_util_unittest.cc
+++ b/chrome/browser/sync/sync_ui_util_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -69,7 +69,6 @@ TEST(SyncUIUtilTest, ConstructAboutInformationWithUnrecoverableErrorTest) {
string16 str(ASCIIToUTF16("none"));
browser_sync::SyncBackendHost::Status status;
- status.summary = browser_sync::SyncBackendHost::Status::OFFLINE_UNUSABLE;
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillOnce(Return(true));
@@ -160,7 +159,6 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
EXPECT_CALL(service, SetupInProgress())
.WillOnce(Return(true));
browser_sync::SyncBackendHost::Status status;
- status.summary = browser_sync::SyncBackendHost::Status::READY;
EXPECT_CALL(service, QueryDetailedSyncStatus())
.WillOnce(Return(status));
*auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE);
@@ -178,7 +176,6 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
EXPECT_CALL(service, unrecoverable_error_detected())
.WillOnce(Return(true));
browser_sync::SyncBackendHost::Status status;
- status.summary = browser_sync::SyncBackendHost::Status::READY;
EXPECT_CALL(service, QueryDetailedSyncStatus())
.WillOnce(Return(status));
return;
@@ -187,7 +184,6 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillOnce(Return(true));
browser_sync::SyncBackendHost::Status status;
- status.summary = browser_sync::SyncBackendHost::Status::READY;
EXPECT_CALL(service, QueryDetailedSyncStatus())
.WillOnce(Return(status));
EXPECT_CALL(service, unrecoverable_error_detected())
@@ -203,7 +199,6 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillOnce(Return(true));
browser_sync::SyncBackendHost::Status status;
- status.summary = browser_sync::SyncBackendHost::Status::READY;
EXPECT_CALL(service, QueryDetailedSyncStatus())
.WillOnce(Return(status));
*auth_error = new GoogleServiceAuthError(
@@ -222,7 +217,6 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
browser_sync::SyncProtocolError protocolError;
protocolError.action = browser_sync::STOP_AND_RESTART_SYNC;
browser_sync::SyncBackendHost::Status status;
- status.summary = browser_sync::SyncBackendHost::Status::READY;
status.sync_protocol_error = protocolError;
EXPECT_CALL(service, QueryDetailedSyncStatus())
.WillOnce(Return(status));
@@ -239,7 +233,6 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillOnce(Return(true));
browser_sync::SyncBackendHost::Status status;
- status.summary = browser_sync::SyncBackendHost::Status::READY;
EXPECT_CALL(service, QueryDetailedSyncStatus())
.WillOnce(Return(status));
*auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE);
@@ -259,7 +252,6 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillOnce(Return(true));
browser_sync::SyncBackendHost::Status status;
- status.summary = browser_sync::SyncBackendHost::Status::READY;
EXPECT_CALL(service, QueryDetailedSyncStatus())
.WillOnce(Return(status));
*auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE);
diff --git a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
index a061589..235f1df 100644
--- a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
@@ -37,8 +37,6 @@ IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest, OfflineToOnline) {
EnableNetwork(GetProfile(0));
ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Commit changes."));
- ASSERT_EQ(ProfileSyncService::Status::READY,
- GetClient(0)->GetStatus().summary);
ASSERT_TRUE(ModelMatchesVerifier(0));
}
@@ -157,13 +155,9 @@ IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(0, L"Google", GURL("http://www.google.com")));
ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Added a bookmark."));
ASSERT_TRUE(ModelMatchesVerifier(0));
- ASSERT_EQ(ProfileSyncService::Status::READY,
- GetClient(0)->GetStatus().summary);
RestartSyncService(0);
ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Restarted sync."));
ASSERT_TRUE(ModelMatchesVerifier(0));
- ASSERT_EQ(ProfileSyncService::Status::READY,
- GetClient(0)->GetStatus().summary);
ASSERT_EQ(0, GetClient(0)->GetStatus().unsynced_count);
}
diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
index 7298870..f1ea473 100644
--- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
@@ -1915,8 +1915,6 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
RestartSyncService(0);
ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Restarted sync."));
ASSERT_TRUE(AllModelsMatchVerifier());
- ASSERT_EQ(ProfileSyncService::Status::READY,
- GetClient(0)->GetStatus().summary);
ASSERT_EQ(0, GetClient(0)->GetStatus().unsynced_count);
}
diff --git a/chrome/test/functional/sync.py b/chrome/test/functional/sync.py
index 9521e41..e82a705 100755
--- a/chrome/test/functional/sync.py
+++ b/chrome/test/functional/sync.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -48,7 +48,6 @@ class SyncTest(pyauto.PyUITest):
test_utils.SignInToSyncAndVerifyState(self, 'test_google_account')
self.RestartBrowser(clear_profile=False)
self.assertTrue(self.AwaitSyncRestart())
- self.assertTrue(self.GetSyncInfo()['summary'] == 'READY')
self.assertTrue(self.GetSyncInfo()['last synced'] == 'Just now')
self.assertTrue(self.GetSyncInfo()['updates received'] == 0)
diff --git a/chrome/test/functional/test_utils.py b/chrome/test/functional/test_utils.py
index 4769e1d..5322216 100644
--- a/chrome/test/functional/test_utils.py
+++ b/chrome/test/functional/test_utils.py
@@ -338,10 +338,8 @@ def SignInToSyncAndVerifyState(test, account_key):
creds = test.GetPrivateInfo()[account_key]
username = creds['username']
password = creds['password']
- test.assertTrue(test.GetSyncInfo()['summary'] == 'OFFLINE_UNUSABLE')
test.assertTrue(test.GetSyncInfo()['last synced'] == 'Never')
test.assertTrue(test.SignInToSync(username, password))
- test.assertTrue(test.GetSyncInfo()['summary'] == 'READY')
test.assertTrue(test.GetSyncInfo()['last synced'] == 'Just now')
generated by cgit v1.1 at 2025-05-19 20:55:28 +0000