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

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

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & style Created 7 years, 7 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/sync_global_error.h" 5 #include "chrome/browser/sync/sync_global_error.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/signin/signin_manager.h" 10 #include "chrome/browser/signin/signin_manager.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 private: 55 private:
56 // Overridden from LoginUIService::LoginUI: 56 // Overridden from LoginUIService::LoginUI:
57 virtual void FocusUI() OVERRIDE { 57 virtual void FocusUI() OVERRIDE {
58 ++focus_ui_call_count_; 58 ++focus_ui_call_count_;
59 } 59 }
60 virtual void CloseUI() OVERRIDE {} 60 virtual void CloseUI() OVERRIDE {}
61 61
62 int focus_ui_call_count_; 62 int focus_ui_call_count_;
63 }; 63 };
64 64
65 ProfileKeyedService* BuildMockLoginUIService(content::BrowserContext* profile) { 65 BrowserContextKeyedService* BuildMockLoginUIService(
66 content::BrowserContext* profile) {
66 return new FakeLoginUIService(); 67 return new FakeLoginUIService();
67 } 68 }
68 69
69 // Same as BrowserWithTestWindowTest, but uses MockBrowser to test calls to 70 // Same as BrowserWithTestWindowTest, but uses MockBrowser to test calls to
70 // ExecuteCommand method. 71 // ExecuteCommand method.
71 class SyncGlobalErrorTest : public BrowserWithTestWindowTest { 72 class SyncGlobalErrorTest : public BrowserWithTestWindowTest {
72 public: 73 public:
73 SyncGlobalErrorTest() {} 74 SyncGlobalErrorTest() {}
74 virtual ~SyncGlobalErrorTest() {} 75 virtual ~SyncGlobalErrorTest() {}
75 76
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 .WillRepeatedly(Return(false)); 174 .WillRepeatedly(Return(false));
174 175
175 EXPECT_CALL(service, IsPassphraseRequired()) 176 EXPECT_CALL(service, IsPassphraseRequired())
176 .WillRepeatedly(Return(true)); 177 .WillRepeatedly(Return(true));
177 EXPECT_CALL(service, IsPassphraseRequiredForDecryption()) 178 EXPECT_CALL(service, IsPassphraseRequiredForDecryption())
178 .WillRepeatedly(Return(true)); 179 .WillRepeatedly(Return(true));
179 VerifySyncGlobalErrorResult( 180 VerifySyncGlobalErrorResult(
180 &service, login_ui_service, browser(), &error, 181 &service, login_ui_service, browser(), &error,
181 GoogleServiceAuthError::NONE, true, true); 182 GoogleServiceAuthError::NONE, true, true);
182 } 183 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698