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

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: Rebase 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 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 #endif 843 #endif
844 }; 844 };
845 845
846 #if defined(OS_WIN) 846 #if defined(OS_WIN)
847 // This policy only exists on Windows. 847 // This policy only exists on Windows.
848 848
849 // Sets the locale policy before the browser is started. 849 // Sets the locale policy before the browser is started.
850 class LocalePolicyTest : public PolicyTest { 850 class LocalePolicyTest : public PolicyTest {
851 public: 851 public:
852 LocalePolicyTest() {} 852 LocalePolicyTest() {}
853 virtual ~LocalePolicyTest() {} 853 ~LocalePolicyTest() override {}
854 854
855 virtual void SetUpInProcessBrowserTestFixture() override { 855 void SetUpInProcessBrowserTestFixture() override {
856 PolicyTest::SetUpInProcessBrowserTestFixture(); 856 PolicyTest::SetUpInProcessBrowserTestFixture();
857 PolicyMap policies; 857 PolicyMap policies;
858 policies.Set(key::kApplicationLocaleValue, 858 policies.Set(key::kApplicationLocaleValue,
859 POLICY_LEVEL_MANDATORY, 859 POLICY_LEVEL_MANDATORY,
860 POLICY_SCOPE_USER, 860 POLICY_SCOPE_USER,
861 new base::StringValue("fr"), 861 new base::StringValue("fr"),
862 NULL); 862 NULL);
863 provider_.UpdateChromePolicy(policies); 863 provider_.UpdateChromePolicy(policies);
864 // The "en-US" ResourceBundle is always loaded before this step for tests, 864 // The "en-US" ResourceBundle is always loaded before this step for tests,
865 // but in this test we want the browser to load the bundle as it 865 // but in this test we want the browser to load the bundle as it
(...skipping 2897 matching lines...) Expand 10 before | Expand all | Expand 10 after
3763 PrefService* prefs = browser()->profile()->GetPrefs(); 3763 PrefService* prefs = browser()->profile()->GetPrefs();
3764 EXPECT_TRUE(extensions::MessageService::IsNativeMessagingHostAllowed( 3764 EXPECT_TRUE(extensions::MessageService::IsNativeMessagingHostAllowed(
3765 prefs, "host.name")); 3765 prefs, "host.name"));
3766 EXPECT_FALSE(extensions::MessageService::IsNativeMessagingHostAllowed( 3766 EXPECT_FALSE(extensions::MessageService::IsNativeMessagingHostAllowed(
3767 prefs, "other.host.name")); 3767 prefs, "other.host.name"));
3768 } 3768 }
3769 3769
3770 #endif // !defined(CHROME_OS) 3770 #endif // !defined(CHROME_OS)
3771 3771
3772 } // namespace policy 3772 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698