| 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 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1555 InstallCRX(data_dir().AppendASCII("theme.crx"), INSTALL_NEW); | 1555 InstallCRX(data_dir().AppendASCII("theme.crx"), INSTALL_NEW); |
| 1556 EXPECT_TRUE(processor->changes().empty()); | 1556 EXPECT_TRUE(processor->changes().empty()); |
| 1557 } | 1557 } |
| 1558 | 1558 |
| 1559 #if defined(ENABLE_SUPERVISED_USERS) | 1559 #if defined(ENABLE_SUPERVISED_USERS) |
| 1560 | 1560 |
| 1561 class ExtensionServiceTestSupervised : public ExtensionServiceSyncTest, | 1561 class ExtensionServiceTestSupervised : public ExtensionServiceSyncTest, |
| 1562 public SupervisedUserService::Delegate { | 1562 public SupervisedUserService::Delegate { |
| 1563 public: | 1563 public: |
| 1564 ExtensionServiceTestSupervised() | 1564 ExtensionServiceTestSupervised() |
| 1565 : field_trial_list_(new base::MockEntropyProvider()) {} | 1565 : field_trial_list_(base::MakeUnique<base::MockEntropyProvider>()) {} |
| 1566 | 1566 |
| 1567 void SetUp() override { | 1567 void SetUp() override { |
| 1568 ExtensionServiceSyncTest::SetUp(); | 1568 ExtensionServiceSyncTest::SetUp(); |
| 1569 | 1569 |
| 1570 // This is the update URL specified in the permissions test extension. | 1570 // This is the update URL specified in the permissions test extension. |
| 1571 // Setting it here is necessary to make the extension considered syncable. | 1571 // Setting it here is necessary to make the extension considered syncable. |
| 1572 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( | 1572 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
| 1573 switches::kAppsGalleryUpdateURL, | 1573 switches::kAppsGalleryUpdateURL, |
| 1574 "http://localhost/autoupdate/updates.xml"); | 1574 "http://localhost/autoupdate/updates.xml"); |
| 1575 } | 1575 } |
| (...skipping 934 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 |