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

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

Issue 2305433003: Revert of Disallow non-namespaced use of base::Version. (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « chrome/browser/component_updater/pepper_flash_component_installer.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 3789 matching lines...) Expand 10 before | Expand all | Expand 10 after
3800 3800
3801 // component id "jebgalgnebhfojomionfpkfelancnnkf". 3801 // component id "jebgalgnebhfojomionfpkfelancnnkf".
3802 static const uint8_t jebg_hash[] = { 3802 static const uint8_t jebg_hash[] = {
3803 0x94, 0x16, 0x0b, 0x6d, 0x41, 0x75, 0xe9, 0xec, 0x8e, 0xd5, 0xfa, 3803 0x94, 0x16, 0x0b, 0x6d, 0x41, 0x75, 0xe9, 0xec, 0x8e, 0xd5, 0xfa,
3804 0x54, 0xb0, 0xd2, 0xdd, 0xa5, 0x6e, 0x05, 0x6b, 0xe8, 0x73, 0x47, 3804 0x54, 0xb0, 0xd2, 0xdd, 0xa5, 0x6e, 0x05, 0x6b, 0xe8, 0x73, 0x47,
3805 0xf6, 0xc4, 0x11, 0x9f, 0xbc, 0xb3, 0x09, 0xb3, 0x5b, 0x40}; 3805 0xf6, 0xc4, 0x11, 0x9f, 0xbc, 0xb3, 0x09, 0xb3, 0x5b, 0x40};
3806 3806
3807 // The component uses HTTPS only for network interception purposes. 3807 // The component uses HTTPS only for network interception purposes.
3808 update_client::CrxComponent crx_component; 3808 update_client::CrxComponent crx_component;
3809 crx_component.pk_hash.assign(std::begin(jebg_hash), std::end(jebg_hash)); 3809 crx_component.pk_hash.assign(std::begin(jebg_hash), std::end(jebg_hash));
3810 crx_component.version = base::Version("0.9"); 3810 crx_component.version = Version("0.9");
3811 crx_component.installer = scoped_refptr<MockInstaller>(new MockInstaller()); 3811 crx_component.installer = scoped_refptr<MockInstaller>(new MockInstaller());
3812 crx_component.requires_network_encryption = true; 3812 crx_component.requires_network_encryption = true;
3813 crx_component.supports_group_policy_enable_component_updates = 3813 crx_component.supports_group_policy_enable_component_updates =
3814 supports_group_policy_enable_component_updates; 3814 supports_group_policy_enable_component_updates;
3815 3815
3816 return crx_component; 3816 return crx_component;
3817 } 3817 }
3818 3818
3819 void ComponentUpdaterPolicyTest::UpdateComponent( 3819 void ComponentUpdaterPolicyTest::UpdateComponent(
3820 const update_client::CrxComponent& crx_component) { 3820 const update_client::CrxComponent& crx_component) {
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
4386 4386
4387 SetEmptyPolicy(); 4387 SetEmptyPolicy();
4388 // Policy not set. 4388 // Policy not set.
4389 CheckSystemTimezoneAutomaticDetectionPolicyUnset(); 4389 CheckSystemTimezoneAutomaticDetectionPolicyUnset();
4390 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false)); 4390 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false));
4391 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests()); 4391 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests());
4392 } 4392 }
4393 #endif // defined(OS_CHROMEOS) 4393 #endif // defined(OS_CHROMEOS)
4394 4394
4395 } // namespace policy 4395 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/component_updater/pepper_flash_component_installer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698