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

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

Issue 7649006: more changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix another typo Created 9 years, 4 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) 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 "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/net/gaia/token_service.h" 9 #include "chrome/browser/net/gaia/token_service.h"
10 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h" 10 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 "", true, NULL)); 117 "", true, NULL));
118 EXPECT_TRUE( 118 EXPECT_TRUE(
119 service_->sync_service_url().spec() == 119 service_->sync_service_url().spec() ==
120 ProfileSyncService::kSyncServerUrl || 120 ProfileSyncService::kSyncServerUrl ||
121 service_->sync_service_url().spec() == 121 service_->sync_service_url().spec() ==
122 ProfileSyncService::kDevServerUrl); 122 ProfileSyncService::kDevServerUrl);
123 } 123 }
124 124
125 TEST_F(ProfileSyncServiceTest, DisabledByPolicy) { 125 TEST_F(ProfileSyncServiceTest, DisabledByPolicy) {
126 profile_->GetTestingPrefService()->SetManagedPref( 126 profile_->GetTestingPrefService()->SetManagedPref(
127 prefs::kSyncManaged, 127 prefs::kSyncManaged, base::TrueValue());
128 Value::CreateBooleanValue(true));
129 service_.reset(new TestProfileSyncService(&factory_, profile_.get(), 128 service_.reset(new TestProfileSyncService(&factory_, profile_.get(),
130 "", true, NULL)); 129 "", true, NULL));
131 service_->Initialize(); 130 service_->Initialize();
132 EXPECT_TRUE(service_->IsManaged()); 131 EXPECT_TRUE(service_->IsManaged());
133 } 132 }
134 133
135 TEST_F(ProfileSyncServiceTest, AbortedByShutdown) { 134 TEST_F(ProfileSyncServiceTest, AbortedByShutdown) {
136 service_.reset(new TestProfileSyncService(&factory_, profile_.get(), 135 service_.reset(new TestProfileSyncService(&factory_, profile_.get(),
137 "test", true, NULL)); 136 "test", true, NULL));
138 EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).Times(0); 137 EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).Times(0);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 EXPECT_TRUE(service_->sync_initialized()); 191 EXPECT_TRUE(service_->sync_initialized());
193 js_controller->RemoveJsEventHandler(&event_handler); 192 js_controller->RemoveJsEventHandler(&event_handler);
194 } 193 }
195 194
196 TEST_F(ProfileSyncServiceTest, JsControllerProcessJsMessageBasic) { 195 TEST_F(ProfileSyncServiceTest, JsControllerProcessJsMessageBasic) {
197 StartSyncService(); 196 StartSyncService();
198 197
199 StrictMock<MockJsReplyHandler> reply_handler; 198 StrictMock<MockJsReplyHandler> reply_handler;
200 199
201 ListValue arg_list1; 200 ListValue arg_list1;
202 arg_list1.Append(Value::CreateBooleanValue(false)); 201 arg_list1.Append(base::FalseValue());
203 JsArgList args1(&arg_list1); 202 JsArgList args1(&arg_list1);
204 EXPECT_CALL(reply_handler, 203 EXPECT_CALL(reply_handler,
205 HandleJsReply("getNotificationState", HasArgs(args1))); 204 HandleJsReply("getNotificationState", HasArgs(args1)));
206 205
207 { 206 {
208 JsController* js_controller = service_->GetJsController(); 207 JsController* js_controller = service_->GetJsController();
209 js_controller->ProcessJsMessage("getNotificationState", args1, 208 js_controller->ProcessJsMessage("getNotificationState", args1,
210 reply_handler.AsWeakHandle()); 209 reply_handler.AsWeakHandle());
211 } 210 }
212 211
213 // This forces the sync thread to process the message and reply. 212 // This forces the sync thread to process the message and reply.
214 service_.reset(); 213 service_.reset();
215 ui_loop_.RunAllPending(); 214 ui_loop_.RunAllPending();
216 } 215 }
217 216
218 TEST_F(ProfileSyncServiceTest, 217 TEST_F(ProfileSyncServiceTest,
219 JsControllerProcessJsMessageBasicDelayedBackendInitialization) { 218 JsControllerProcessJsMessageBasicDelayedBackendInitialization) {
220 StartSyncServiceAndSetInitialSyncEnded(true, false, false, true); 219 StartSyncServiceAndSetInitialSyncEnded(true, false, false, true);
221 220
222 StrictMock<MockJsReplyHandler> reply_handler; 221 StrictMock<MockJsReplyHandler> reply_handler;
223 222
224 ListValue arg_list1; 223 ListValue arg_list1;
225 arg_list1.Append(Value::CreateBooleanValue(false)); 224 arg_list1.Append(base::FalseValue());
226 JsArgList args1(&arg_list1); 225 JsArgList args1(&arg_list1);
227 EXPECT_CALL(reply_handler, 226 EXPECT_CALL(reply_handler,
228 HandleJsReply("getNotificationState", HasArgs(args1))); 227 HandleJsReply("getNotificationState", HasArgs(args1)));
229 228
230 { 229 {
231 JsController* js_controller = service_->GetJsController(); 230 JsController* js_controller = service_->GetJsController();
232 js_controller->ProcessJsMessage("getNotificationState", 231 js_controller->ProcessJsMessage("getNotificationState",
233 args1, reply_handler.AsWeakHandle()); 232 args1, reply_handler.AsWeakHandle());
234 } 233 }
235 234
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 // This will still exist, but the text should have changed. 278 // This will still exist, but the text should have changed.
280 ASSERT_TRUE(file_util::PathExists(sync_file2)); 279 ASSERT_TRUE(file_util::PathExists(sync_file2));
281 std::string file2text; 280 std::string file2text;
282 ASSERT_TRUE(file_util::ReadFileToString(sync_file2, &file2text)); 281 ASSERT_TRUE(file_util::ReadFileToString(sync_file2, &file2text));
283 ASSERT_NE(file2text.compare(nonsense2), 0); 282 ASSERT_NE(file2text.compare(nonsense2), 0);
284 } 283 }
285 284
286 } // namespace 285 } // namespace
287 286
288 } // namespace browser_sync 287 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698