OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <memory> | 8 #include <memory> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
296 TEST_F(ExtensionServiceSyncTest, DisableExtensionFromSync) { | 296 TEST_F(ExtensionServiceSyncTest, DisableExtensionFromSync) { |
297 // Start the extensions service with one external extension already installed. | 297 // Start the extensions service with one external extension already installed. |
298 base::FilePath source_install_dir = | 298 base::FilePath source_install_dir = |
299 data_dir().AppendASCII("good").AppendASCII("Extensions"); | 299 data_dir().AppendASCII("good").AppendASCII("Extensions"); |
300 base::FilePath pref_path = | 300 base::FilePath pref_path = |
301 source_install_dir.DirName().Append(chrome::kPreferencesFilename); | 301 source_install_dir.DirName().Append(chrome::kPreferencesFilename); |
302 | 302 |
303 InitializeInstalledExtensionService(pref_path, source_install_dir); | 303 InitializeInstalledExtensionService(pref_path, source_install_dir); |
304 | 304 |
305 // The user has enabled sync. | 305 // The user has enabled sync. |
306 ProfileSyncService* sync_service = | 306 browser_sync::ProfileSyncService* sync_service = |
307 ProfileSyncServiceFactory::GetForProfile(profile()); | 307 ProfileSyncServiceFactory::GetForProfile(profile()); |
308 sync_service->SetFirstSetupComplete(); | 308 sync_service->SetFirstSetupComplete(); |
309 | 309 |
310 service()->Init(); | 310 service()->Init(); |
311 ASSERT_TRUE(service()->is_ready()); | 311 ASSERT_TRUE(service()->is_ready()); |
312 | 312 |
313 ASSERT_EQ(3u, loaded_.size()); | 313 ASSERT_EQ(3u, loaded_.size()); |
314 | 314 |
315 // We start enabled. | 315 // We start enabled. |
316 const Extension* extension = service()->GetExtensionById(good0, true); | 316 const Extension* extension = service()->GetExtensionById(good0, true); |
(...skipping 21 matching lines...) Expand all Loading... |
338 TEST_F(ExtensionServiceSyncTest, IgnoreSyncChangesWhenLocalStateIsMoreRecent) { | 338 TEST_F(ExtensionServiceSyncTest, IgnoreSyncChangesWhenLocalStateIsMoreRecent) { |
339 // Start the extension service with three extensions already installed. | 339 // Start the extension service with three extensions already installed. |
340 base::FilePath source_install_dir = | 340 base::FilePath source_install_dir = |
341 data_dir().AppendASCII("good").AppendASCII("Extensions"); | 341 data_dir().AppendASCII("good").AppendASCII("Extensions"); |
342 base::FilePath pref_path = | 342 base::FilePath pref_path = |
343 source_install_dir.DirName().Append(chrome::kPreferencesFilename); | 343 source_install_dir.DirName().Append(chrome::kPreferencesFilename); |
344 | 344 |
345 InitializeInstalledExtensionService(pref_path, source_install_dir); | 345 InitializeInstalledExtensionService(pref_path, source_install_dir); |
346 | 346 |
347 // The user has enabled sync. | 347 // The user has enabled sync. |
348 ProfileSyncService* sync_service = | 348 browser_sync::ProfileSyncService* sync_service = |
349 ProfileSyncServiceFactory::GetForProfile(profile()); | 349 ProfileSyncServiceFactory::GetForProfile(profile()); |
350 sync_service->SetFirstSetupComplete(); | 350 sync_service->SetFirstSetupComplete(); |
351 // Make sure ExtensionSyncService is created, so it'll be notified of changes. | 351 // Make sure ExtensionSyncService is created, so it'll be notified of changes. |
352 extension_sync_service(); | 352 extension_sync_service(); |
353 | 353 |
354 service()->Init(); | 354 service()->Init(); |
355 ASSERT_TRUE(service()->is_ready()); | 355 ASSERT_TRUE(service()->is_ready()); |
356 ASSERT_EQ(3u, loaded_.size()); | 356 ASSERT_EQ(3u, loaded_.size()); |
357 | 357 |
358 ASSERT_TRUE(service()->IsExtensionEnabled(good0)); | 358 ASSERT_TRUE(service()->IsExtensionEnabled(good0)); |
(...skipping 2151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2510 break; | 2510 break; |
2511 } | 2511 } |
2512 } | 2512 } |
2513 } | 2513 } |
2514 EXPECT_TRUE(found_delete); | 2514 EXPECT_TRUE(found_delete); |
2515 | 2515 |
2516 // Make sure there is one extension, and there are no more apps. | 2516 // Make sure there is one extension, and there are no more apps. |
2517 EXPECT_EQ(1u, extensions_processor.data().size()); | 2517 EXPECT_EQ(1u, extensions_processor.data().size()); |
2518 EXPECT_TRUE(apps_processor.data().empty()); | 2518 EXPECT_TRUE(apps_processor.data().empty()); |
2519 } | 2519 } |
OLD | NEW |