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

Side by Side Diff: chrome/browser/policy/policy_browsertest.cc

Issue 1257633002: Componentize VersionInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix OWNERS (copy from //chrome/OWNERS) Created 5 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
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 <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 1662 matching lines...) Expand 10 before | Expand all | Expand 10 after
1673 } 1673 }
1674 1674
1675 IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallBlacklistSharedModules) { 1675 IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallBlacklistSharedModules) {
1676 // Verifies that shared_modules are not affected by the blacklist. 1676 // Verifies that shared_modules are not affected by the blacklist.
1677 1677
1678 const char kImporterId[] = "pchakhniekfaeoddkifplhnfbffomabh"; 1678 const char kImporterId[] = "pchakhniekfaeoddkifplhnfbffomabh";
1679 const char kSharedModuleId[] = "nfgclafboonjbiafbllihiailjlhelpm"; 1679 const char kSharedModuleId[] = "nfgclafboonjbiafbllihiailjlhelpm";
1680 1680
1681 // Make sure that "import" and "export" are available to these extension IDs 1681 // Make sure that "import" and "export" are available to these extension IDs
1682 // by mocking the release channel. 1682 // by mocking the release channel.
1683 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_DEV); 1683 extensions::ScopedCurrentChannel channel(version_info::CHANNEL_DEV);
1684 1684
1685 // Verify that the extensions are not installed initially. 1685 // Verify that the extensions are not installed initially.
1686 ExtensionService* service = extension_service(); 1686 ExtensionService* service = extension_service();
1687 ASSERT_FALSE(service->GetExtensionById(kImporterId, true)); 1687 ASSERT_FALSE(service->GetExtensionById(kImporterId, true));
1688 ASSERT_FALSE(service->GetExtensionById(kSharedModuleId, true)); 1688 ASSERT_FALSE(service->GetExtensionById(kSharedModuleId, true));
1689 1689
1690 // Mock the webstore update URL. This is where the shared module extension 1690 // Mock the webstore update URL. This is where the shared module extension
1691 // will be installed from. 1691 // will be installed from.
1692 base::FilePath update_xml_path = base::FilePath(kTestExtensionsDir) 1692 base::FilePath update_xml_path = base::FilePath(kTestExtensionsDir)
1693 .AppendASCII("policy_shared_module") 1693 .AppendASCII("policy_shared_module")
(...skipping 2165 matching lines...) Expand 10 before | Expand all | Expand 10 after
3859 3859
3860 IN_PROC_BROWSER_TEST_F(HardwareAccelerationModePolicyTest, 3860 IN_PROC_BROWSER_TEST_F(HardwareAccelerationModePolicyTest,
3861 HardwareAccelerationDisabled) { 3861 HardwareAccelerationDisabled) {
3862 // Verifies that hardware acceleration can be disabled with policy. 3862 // Verifies that hardware acceleration can be disabled with policy.
3863 EXPECT_FALSE( 3863 EXPECT_FALSE(
3864 content::GpuDataManager::GetInstance()->GpuAccessAllowed(nullptr)); 3864 content::GpuDataManager::GetInstance()->GpuAccessAllowed(nullptr));
3865 } 3865 }
3866 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 3866 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
3867 3867
3868 } // namespace policy 3868 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698