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

Unified Diff: chrome/browser/sync/sync_global_error_unittest.cc

Issue 8613001: Revert 110905 - Adding parameter to GetStatusLabels to indicate if links are acceptable, as some ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/profile_sync_service_mock.h ('k') | chrome/browser/sync/sync_ui_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_global_error_unittest.cc
===================================================================
--- chrome/browser/sync/sync_global_error_unittest.cc (revision 110908)
+++ chrome/browser/sync/sync_global_error_unittest.cc (working copy)
@@ -13,7 +13,6 @@
#include "testing/gtest/include/gtest/gtest.h"
using ::testing::Return;
-using ::testing::ReturnRef;
using ::testing::NiceMock;
using content::BrowserThread;
@@ -26,6 +25,9 @@
GoogleServiceAuthError::State error_state,
bool is_signed_in,
bool is_error) {
+ GoogleServiceAuthError auth_error(error_state);
+ service->UpdateAuthErrorState(auth_error);
+
EXPECT_CALL(*service, HasSyncSetupCompleted())
.WillRepeatedly(Return(is_signed_in));
if (error_state == GoogleServiceAuthError::SERVICE_UNAVAILABLE) {
@@ -36,9 +38,6 @@
.WillRepeatedly(Return(UTF8ToUTF16("foo")));
}
- GoogleServiceAuthError auth_error(error_state);
- EXPECT_CALL(*service, GetAuthError()).WillRepeatedly(ReturnRef(auth_error));
-
error->OnStateChanged();
// If there is an error then a wrench button badge, menu item, and bubble view
« no previous file with comments | « chrome/browser/sync/profile_sync_service_mock.h ('k') | chrome/browser/sync/sync_ui_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698