Revert 107748 - Add policy for blocking GCP printing.

BUG=101389
TEST=On any platform use the appropriate policy mechanism to set CloudPrintSubmitEnabled to false.  Cloud print should no longer be available via built in print mechanisms


Review URL: http://codereview.chromium.org/8395007

TBR=abodenha@chromium.org
Review URL: http://codereview.chromium.org/8416047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107761 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/policy/policy_templates.json

@@ -1847,21 +1847,6 @@
       'caption': '''Device-level network configuration''',
       'desc': '''Allows pushing network configuration to be applied for all useers of a <ph name="PRODUCT_OS_NAME">$2<ex>Chromium OS</ex></ph> device. The network configuration is a JSON-formatted string as defined by the Open Network Configuration format described at https://sites.google.com/a/chromium.org/dev/chromium-os/chromiumos-design-docs/open-network-configuration''',
     },
-    {
-      'name': 'CloudPrintSubmitEnabled',
-      'type': 'main',
-      'supported_on': ['chrome.*:17-'],
-      'features': {'dynamic_refresh': 1},
-      'future': False,
-      'example_value': True,
-      'id': 109,
-      'caption': '''Enable submission of documents to <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph>''',
-      'desc': '''      Enables <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> to submit documents to <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph> for printing.  NOTE: This only affects <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph> support in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.  It does not prevent users from submitting print jobs on web sites.
-
-      If this setting is enabled or not configured, users can print to <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph> from the <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> print dialog.
-
-      If this setting is disabled, users cannot print to <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph> from the <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> print dialog''',
-    },
   ],
   'messages': {
     # Messages that are not associated to any policies.

chrome/browser/policy/config_dir_policy_provider_unittest.cc

@@ -371,10 +371,7 @@ INSTANTIATE_TEST_CASE_P(
     testing::Values(
         ValueTestParams::ForIntegerPolicy(
             kPolicyPolicyRefreshRate,
-            key::kPolicyRefreshRate),
-        ValueTestParams::ForBooleanPolicy(
-            kPolicyCloudPrintSubmitEnabled,
-            key::kCloudPrintSubmitEnabled));
+            key::kPolicyRefreshRate)));
 #endif
 
 }  // namespace policy

chrome/browser/policy/configuration_policy_handler.cc

@@ -443,8 +443,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
     prefs::kRemoteAccessHostFirewallTraversal },
   { Value::TYPE_BOOLEAN, kPolicyCloudPrintProxyEnabled,
     prefs::kCloudPrintProxyEnabled },
-  { Value::TYPE_BOOLEAN, kPolicyCloudPrintSubmitEnabled,
-    prefs::kCloudPrintSubmitEnabled },
   { Value::TYPE_BOOLEAN, kPolicyTranslateEnabled, prefs::kEnableTranslate },
   { Value::TYPE_BOOLEAN, kPolicyAllowOutdatedPlugins,
     prefs::kPluginsAllowOutdated },

chrome/browser/policy/configuration_policy_pref_store_unittest.cc

@@ -210,8 +210,6 @@ INSTANTIATE_TEST_CASE_P(
                     prefs::kRemoteAccessHostFirewallTraversal),
         TypeAndName(kPolicyCloudPrintProxyEnabled,
                     prefs::kCloudPrintProxyEnabled),
-        TypeAndName(kPolicyCloudPrintSubmitEnabled,
-                    prefs::kCloudPrintSubmitEnabled),
         TypeAndName(kPolicySavingBrowserHistoryDisabled,
                     prefs::kSavingBrowserHistoryDisabled),
         TypeAndName(kPolicySavingBrowserHistoryDisabled,

chrome/browser/policy/configuration_policy_provider_mac_unittest.cc

@@ -362,8 +362,6 @@ INSTANTIATE_TEST_CASE_P(
     testing::Values(
         PolicyTestParams::ForListPolicy(
             kPolicyURLWhitelist,
-            key::kURLWhitelist),
-        PolicyTestParams::ForBooleanPolicy(
-            kPolicyCloudPrintSubmitEnabled,
-            key::kCloudPrintSubmitEnabled)));
+            key::kURLWhitelist)));
+
 }  // namespace policy

chrome/browser/policy/configuration_policy_provider_win_unittest.cc

@@ -521,9 +521,6 @@ INSTANTIATE_TEST_CASE_P(
     testing::Values(
         PolicyTestParams::ForListPolicy(
             kPolicyURLWhitelist,
-            key::kURLWhitelist),
-        PolicyTestParams::ForBooleanPolicy(
-            kPolicyCloudPrintSubmitEnabled,
-            key::kCloudPrintSubmitEnabled)));
+            key::kURLWhitelist)));
 
 }  // namespace policy

chrome/browser/ui/browser.cc

@@ -2402,9 +2402,6 @@ void Browser::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled,
                              true,
                              PrefService::UNSYNCABLE_PREF);
-  prefs->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled,
-                             true,
-                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kDevToolsDisabled,
                              false,
                              PrefService::UNSYNCABLE_PREF);

chrome/browser/ui/webui/print_preview_handler.cc

@@ -24,7 +24,6 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/platform_util.h"
-#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/printing/print_dialog_cloud.h"
@@ -33,7 +32,6 @@
 #include "chrome/browser/printing/print_system_task_proxy.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/printing/printer_manager_dialog.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -41,7 +39,6 @@
 #include "chrome/browser/ui/webui/cloud_print_signin_dialog.h"
 #include "chrome/browser/ui/webui/print_preview_ui.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/common/print_messages.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ -661,13 +658,10 @@ void PrintPreviewHandler::SetupPrinterList(const ListValue& printers) {
 }
 
 void PrintPreviewHandler::SendCloudPrintEnabled() {
-  Profile* profile = BrowserList::GetLastActive()->profile();
-  PrefService* prefs = profile->GetPrefs();
-  if (prefs->GetBoolean(prefs::kCloudPrintSubmitEnabled)) {
-    GURL gcp_url(CloudPrintURL(profile).GetCloudPrintServiceURL());
-    base::StringValue gcp_url_value(gcp_url.spec());
-    web_ui_->CallJavascriptFunction("setUseCloudPrint", gcp_url_value);
-  }
+  GURL gcp_url(CloudPrintURL(BrowserList::GetLastActive()->profile()).
+               GetCloudPrintServiceURL());
+  base::StringValue gcp_url_value(gcp_url.spec());
+  web_ui_->CallJavascriptFunction("setUseCloudPrint", gcp_url_value);
 }
 
 void PrintPreviewHandler::SendCloudPrintJob(const DictionaryValue& settings,

chrome/common/pref_names.cc

@@ -1553,9 +1553,6 @@ const char kCloudPrintRobotRefreshToken[] = "cloud_print.robot_refresh_token";
 const char kCloudPrintRobotEmail[] = "cloud_print.robot_email";
 // Indicates whether the Mac Virtual driver is enabled.
 const char kVirtualPrinterDriverEnabled[] = "cloud_print.enable_virtual_driver";
-// A boolean indicating whether submitting jobs to Google Cloud Print is
-// blocked by policy.
-const char kCloudPrintSubmitEnabled[] = "cloud_print.submit_enabled";
 
 // Preference to store proxy settings.
 const char kProxy[] = "proxy";

chrome/common/pref_names.h

@@ -545,7 +545,6 @@ extern const char kCloudPrintEnableJobPoll[];
 extern const char kCloudPrintRobotRefreshToken[];
 extern const char kCloudPrintRobotEmail[];
 extern const char kVirtualPrinterDriverEnabled[];
-extern const char kCloudPrintSubmitEnabled[];
 
 extern const char kProxy[];
 extern const char kMaxConnectionsPerProxy[];