Disable the Developer Tools when Javascript is disabled.

chrome/browser/policy/configuration_policy_pref_store_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
+#include "chrome/common/content_settings.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_store_observer_mock.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::Mock;
 
 namespace policy {
 
@@ skipping 176 matching lines @@
         TypeAndName(kPolicyMetricsReportingEnabled,
                     prefs::kMetricsReportingEnabled),
         TypeAndName(kPolicyPasswordManagerEnabled,
                     prefs::kPasswordManagerEnabled),
         TypeAndName(kPolicyPasswordManagerAllowShowPasswords,
                     prefs::kPasswordManagerAllowShowPasswords),
         TypeAndName(kPolicyShowHomeButton,
                     prefs::kShowHomeButton),
         TypeAndName(kPolicyPrintingEnabled,
                     prefs::kPrintingEnabled),
-        TypeAndName(kPolicyJavascriptEnabled,
-                    prefs::kWebKitJavascriptEnabled),
         TypeAndName(kPolicyRemoteAccessHostFirewallTraversal,
                     prefs::kRemoteAccessHostFirewallTraversal),
         TypeAndName(kPolicyCloudPrintProxyEnabled,
                     prefs::kCloudPrintProxyEnabled),
         TypeAndName(kPolicyCloudPrintSubmitEnabled,
                     prefs::kCloudPrintSubmitEnabled),
         TypeAndName(kPolicySavingBrowserHistoryDisabled,
                     prefs::kSavingBrowserHistoryDisabled),
         TypeAndName(kPolicySavingBrowserHistoryDisabled,
                     prefs::kSavingBrowserHistoryDisabled),
@@ skipping 27 matching lines @@
                     prefs::kAllowCrossOriginAuthPrompt),
         TypeAndName(kPolicyImportBookmarks,
                     prefs::kImportBookmarks),
         TypeAndName(kPolicyImportHistory,
                     prefs::kImportHistory),
         TypeAndName(kPolicyImportHomepage,
                     prefs::kImportHomepage),
         TypeAndName(kPolicyImportSearchEngine,
                     prefs::kImportSearchEngine),
         TypeAndName(kPolicyImportSavedPasswords,
-                    prefs::kImportSavedPasswords)));
+                    prefs::kImportSavedPasswords),
+        TypeAndName(kPolicyDeveloperToolsDisabled,
+                    prefs::kDevToolsDisabled)));
 
 #if defined(OS_CHROMEOS)
 INSTANTIATE_TEST_CASE_P(
     CrosConfigurationPolicyPrefStoreBooleanTestInstance,
     ConfigurationPolicyPrefStoreBooleanTest,
     testing::Values(
         TypeAndName(kPolicyChromeOsLockOnIdleSuspend,
                     prefs::kEnableScreenLock)));
 #endif  // defined(OS_CHROMEOS)
 
@@ skipping 14 matching lines @@
   const Value* value = NULL;
   EXPECT_EQ(PrefStore::READ_OK,
             store_->GetValue(GetParam().pref_name(), &value));
   EXPECT_TRUE(base::FundamentalValue(2).Equals(value));
 }
 
 INSTANTIATE_TEST_CASE_P(
     ConfigurationPolicyPrefStoreIntegerTestInstance,
     ConfigurationPolicyPrefStoreIntegerTest,
     testing::Values(
+        TypeAndName(kPolicyDefaultCookiesSetting,
+                    prefs::kManagedDefaultCookiesSetting),
+        TypeAndName(kPolicyDefaultImagesSetting,
+                    prefs::kManagedDefaultImagesSetting),
+        TypeAndName(kPolicyDefaultPluginsSetting,
+                    prefs::kManagedDefaultPluginsSetting),
+        TypeAndName(kPolicyDefaultPopupsSetting,
+                    prefs::kManagedDefaultPopupsSetting),
+        TypeAndName(kPolicyDefaultNotificationsSetting,
+                    prefs::kManagedDefaultNotificationsSetting),
+        TypeAndName(kPolicyDefaultGeolocationSetting,
+                    prefs::kManagedDefaultGeolocationSetting),

[Mattias Nissler (ping if slow), 2011/11/03 18:42:02]

Why did you remove all these?

[Joao da Silva, 2011/11/03 20:46:55]

What do you mean? I'm adding these now since they weren't being tested before.

         TypeAndName(kPolicyRestoreOnStartup,
                     prefs::kRestoreOnStartup),
         TypeAndName(kPolicyPolicyRefreshRate,
                     prefs::kUserPolicyRefreshRate),
         TypeAndName(kPolicyMaxConnectionsPerProxy,
                     prefs::kMaxConnectionsPerProxy)));
 
 // Test cases for the proxy policy settings.
 class ConfigurationPolicyPrefStoreProxyTest : public testing::Test {
  protected:
@@ skipping 594 matching lines @@
   EXPECT_FALSE(prompt_for_download);
 }
 
 // Test cases for the Autofill policy setting.
 class ConfigurationPolicyPrefStoreAutofillTest
     : public ConfigurationPolicyPrefStoreTestBase<testing::Test> {
 };
 
 TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Default) {
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
-            store_->GetValue(prefs::kSyncManaged, NULL));
+            store_->GetValue(prefs::kAutofillEnabled, NULL));

[Mattias Nissler (ping if slow), 2011/11/03 18:42:02]

good catches!

[Joao da Silva, 2011/11/03 20:46:55]

Hopefully the test still passes!

 }
 
 TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Enabled) {
   provider_.AddPolicy(kPolicyAutoFillEnabled, Value::CreateBooleanValue(true));
   store_->OnUpdatePolicy();
   // Enabling Autofill should not set the pref.
   EXPECT_EQ(PrefStore::READ_NO_VALUE,
-            store_->GetValue(prefs::kSyncManaged, NULL));
+            store_->GetValue(prefs::kAutofillEnabled, NULL));
 }
 
 TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Disabled) {
   provider_.AddPolicy(kPolicyAutoFillEnabled, Value::CreateBooleanValue(false));
   store_->OnUpdatePolicy();
   // Disabling Autofill should switch the pref to managed.
   const Value* value = NULL;
   EXPECT_EQ(PrefStore::READ_OK,
             store_->GetValue(prefs::kAutofillEnabled, &value));
   ASSERT_TRUE(value);
@@ skipping 50 matching lines @@
   EXPECT_CALL(observer_, OnInitializationCompleted(true)).Times(1);
 
   provider_.SetInitializationComplete(true);
   EXPECT_FALSE(store_->IsInitializationComplete());
 
   store_->OnUpdatePolicy();
   Mock::VerifyAndClearExpectations(&observer_);
   EXPECT_TRUE(store_->IsInitializationComplete());
 }
 
+// Tests for policies that don't quite fit the previous patterns.
+class ConfigurationPolicyPrefStoreOthersTest
+    : public ConfigurationPolicyPrefStoreTestBase<testing::Test> {
+};
+
+TEST_F(ConfigurationPolicyPrefStoreOthersTest, JavascriptEnabled) {
+  // This is a boolean policy, but affects an integer preference.
+  EXPECT_EQ(PrefStore::READ_NO_VALUE,
+            store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
+  provider_.AddPolicy(kPolicyJavascriptEnabled,
+                      Value::CreateBooleanValue(true));
+  store_->OnUpdatePolicy();
+  EXPECT_EQ(PrefStore::READ_NO_VALUE,
+            store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
+  provider_.AddPolicy(kPolicyJavascriptEnabled,
+                      Value::CreateBooleanValue(false));
+  store_->OnUpdatePolicy();
+  const Value* value = NULL;
+  EXPECT_EQ(PrefStore::READ_OK,
+            store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, &value));
+  EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value));
+}
+
+TEST_F(ConfigurationPolicyPrefStoreOthersTest, JavascriptEnabledOverrides) {
+  EXPECT_EQ(PrefStore::READ_NO_VALUE,
+            store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
+  provider_.AddPolicy(kPolicyDefaultJavaScriptSetting,
+                      Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+  store_->OnUpdatePolicy();
+  const Value* value = NULL;
+  EXPECT_EQ(PrefStore::READ_OK,
+            store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, &value));
+  EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_ALLOW).Equals(value));
+  // JavascriptEnabled overrides DefaultJavaScriptSetting.
+  provider_.AddPolicy(kPolicyJavascriptEnabled,
+                      Value::CreateBooleanValue(false));
+  store_->OnUpdatePolicy();
+  EXPECT_EQ(PrefStore::READ_OK,
+            store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, &value));
+  EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value));
+}
+
 }  // namespace policy