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

Side by Side Diff: chrome/browser/net/proxy_policy_handler_unittest.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <string> 5 #include <string>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/net/proxy_policy_handler.h" 9 #include "chrome/browser/net/proxy_policy_handler.h"
10 #include "chrome/browser/prefs/proxy_config_dictionary.h" 10 #include "chrome/browser/prefs/proxy_config_dictionary.h"
11 #include "chrome/browser/prefs/proxy_prefs.h" 11 #include "chrome/browser/prefs/proxy_prefs.h"
12 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
13 #include "components/policy/core/browser/configuration_policy_pref_store.h" 13 #include "components/policy/core/browser/configuration_policy_pref_store.h"
14 #include "components/policy/core/browser/configuration_policy_pref_store_test.h" 14 #include "components/policy/core/browser/configuration_policy_pref_store_test.h"
15 #include "components/policy/core/common/policy_service_impl.h" 15 #include "components/policy/core/common/policy_service_impl.h"
16 #include "policy/policy_constants.h" 16 #include "policy/policy_constants.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 namespace policy { 19 namespace policy {
20 20
21 // Test cases for the proxy policy settings. 21 // Test cases for the proxy policy settings.
22 class ProxyPolicyHandlerTest 22 class ProxyPolicyHandlerTest
23 : public ConfigurationPolicyPrefStoreTest { 23 : public ConfigurationPolicyPrefStoreTest {
24 public: 24 public:
25 virtual void SetUp() OVERRIDE { 25 virtual void SetUp() override {
26 ConfigurationPolicyPrefStoreTest::SetUp(); 26 ConfigurationPolicyPrefStoreTest::SetUp();
27 handler_list_.AddHandler( 27 handler_list_.AddHandler(
28 make_scoped_ptr<ConfigurationPolicyHandler>(new ProxyPolicyHandler)); 28 make_scoped_ptr<ConfigurationPolicyHandler>(new ProxyPolicyHandler));
29 // Reset the PolicyServiceImpl to one that has the policy fixup 29 // Reset the PolicyServiceImpl to one that has the policy fixup
30 // preprocessor. The previous store must be nulled out first so that it 30 // preprocessor. The previous store must be nulled out first so that it
31 // removes itself from the service's observer list. 31 // removes itself from the service's observer list.
32 store_ = NULL; 32 store_ = NULL;
33 policy_service_.reset(new PolicyServiceImpl(providers_)); 33 policy_service_.reset(new PolicyServiceImpl(providers_));
34 store_ = new ConfigurationPolicyPrefStore( 34 store_ = new ConfigurationPolicyPrefStore(
35 policy_service_.get(), &handler_list_, POLICY_LEVEL_MANDATORY); 35 policy_service_.get(), &handler_list_, POLICY_LEVEL_MANDATORY);
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 POLICY_SCOPE_USER, 320 POLICY_SCOPE_USER,
321 new base::FundamentalValue(i), 321 new base::FundamentalValue(i),
322 NULL); 322 NULL);
323 UpdateProviderPolicy(policy); 323 UpdateProviderPolicy(policy);
324 const base::Value* value = NULL; 324 const base::Value* value = NULL;
325 EXPECT_FALSE(store_->GetValue(prefs::kProxy, &value)); 325 EXPECT_FALSE(store_->GetValue(prefs::kProxy, &value));
326 } 326 }
327 } 327 }
328 328
329 } // namespace policy 329 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/net/proxy_policy_handler.h ('k') | chrome/browser/net/quota_policy_channel_id_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698