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

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

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 #endif 842 #endif
843 }; 843 };
844 844
845 #if defined(OS_WIN) 845 #if defined(OS_WIN)
846 // This policy only exists on Windows. 846 // This policy only exists on Windows.
847 847
848 // Sets the locale policy before the browser is started. 848 // Sets the locale policy before the browser is started.
849 class LocalePolicyTest : public PolicyTest { 849 class LocalePolicyTest : public PolicyTest {
850 public: 850 public:
851 LocalePolicyTest() {} 851 LocalePolicyTest() {}
852 virtual ~LocalePolicyTest() {} 852 ~LocalePolicyTest() override {}
853 853
854 virtual void SetUpInProcessBrowserTestFixture() override { 854 void SetUpInProcessBrowserTestFixture() override {
855 PolicyTest::SetUpInProcessBrowserTestFixture(); 855 PolicyTest::SetUpInProcessBrowserTestFixture();
856 PolicyMap policies; 856 PolicyMap policies;
857 policies.Set(key::kApplicationLocaleValue, 857 policies.Set(key::kApplicationLocaleValue,
858 POLICY_LEVEL_MANDATORY, 858 POLICY_LEVEL_MANDATORY,
859 POLICY_SCOPE_USER, 859 POLICY_SCOPE_USER,
860 new base::StringValue("fr"), 860 new base::StringValue("fr"),
861 NULL); 861 NULL);
862 provider_.UpdateChromePolicy(policies); 862 provider_.UpdateChromePolicy(policies);
863 // The "en-US" ResourceBundle is always loaded before this step for tests, 863 // The "en-US" ResourceBundle is always loaded before this step for tests,
864 // but in this test we want the browser to load the bundle as it 864 // but in this test we want the browser to load the bundle as it
(...skipping 2831 matching lines...) Expand 10 before | Expand all | Expand 10 after
3696 PrefService* prefs = browser()->profile()->GetPrefs(); 3696 PrefService* prefs = browser()->profile()->GetPrefs();
3697 EXPECT_TRUE(extensions::MessageService::IsNativeMessagingHostAllowed( 3697 EXPECT_TRUE(extensions::MessageService::IsNativeMessagingHostAllowed(
3698 prefs, "host.name")); 3698 prefs, "host.name"));
3699 EXPECT_FALSE(extensions::MessageService::IsNativeMessagingHostAllowed( 3699 EXPECT_FALSE(extensions::MessageService::IsNativeMessagingHostAllowed(
3700 prefs, "other.host.name")); 3700 prefs, "other.host.name"));
3701 } 3701 }
3702 3702
3703 #endif // !defined(CHROME_OS) 3703 #endif // !defined(CHROME_OS)
3704 3704
3705 } // namespace policy 3705 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698