Removed --disable-privet-local-printing

TBR=noamsml
BUG=350137

Review URL: https://codereview.chromium.org/193723005

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

5 files changed, 2 insertions, 20 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index d6b5ab2..e8de1a9 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5625,12 +5625,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_DEVICE_DISCOVERY_NOTIFICATIONS_DESCRIPTION" desc="Description of the 'device discovery notifications' flag.">
         Device discovery notifications on local network.
       </message>
-      <message name="IDS_FLAGS_DISABLE_PRIVET_LOCAL_PRINTING_NAME">
-        Disable Privet local printing
-      </message>
-      <message name="IDS_FLAGS_DISABLE_PRIVET_LOCAL_PRINTING_DESCRIPTION">
-        Disable printing to printers on the local network using the Privet protocol.
-      </message>
       <if expr="is_win">
         <message name="IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_NAME">
           Enable XPS in <ph name="CLOUD_PRINT_NAME">$1<ex>Google Cloud Print</ex></ph>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 286b5db..363b852 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1476,13 +1476,6 @@ const Experiment kExperiments[] = {
                               switches::kDisableDeviceDiscoveryNotifications)
   },
   {
-    "disable-privet-local-printing",
-    IDS_FLAGS_DISABLE_PRIVET_LOCAL_PRINTING_NAME,
-    IDS_FLAGS_DISABLE_PRIVET_LOCAL_PRINTING_DESCRIPTION,
-    kOsWin | kOsLinux | kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kDisablePrivetLocalPrinting)
-  },
-  {
     "enable-print-preview-register-promos",
     IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_NAME,
     IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_DESCRIPTION,
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 1b0defb..d8a48b4 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -536,9 +536,8 @@ void PrintPreviewHandler::RegisterMessages() {
 
 bool PrintPreviewHandler::PrivetPrintingEnabled() {
 #if defined(ENABLE_MDNS)
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  return !command_line->HasSwitch(switches::kDisableDeviceDiscovery) &&
-      !command_line->HasSwitch(switches::kDisablePrivetLocalPrinting);
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableDeviceDiscovery);
 #else
   return false;
 #endif
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index e03bbea..928ba78 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -384,9 +384,6 @@ const char kDisablePreconnect[]             = "disable-preconnect";
 const char kDisablePrerenderLocalPredictor[] =
     "disable-prerender-local-predictor";
 
-// Disable Privet local printing.
-const char kDisablePrivetLocalPrinting[]     = "disable-privet-local-printing";
-
 // Normally when the user attempts to navigate to a page that was the result of
 // a post we prompt to make sure they want to. This switch may be used to
 // disable that check. This switch is used during automated testing.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index e4d6803..bd8ef26 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -115,7 +115,6 @@ extern const char kDisablePnacl[];
 extern const char kDisablePopupBlocking[];
 extern const char kDisablePreconnect[];
 extern const char kDisablePrerenderLocalPredictor[];
-extern const char kDisablePrivetLocalPrinting[];
 extern const char kDisablePromptOnRepost[];
 extern const char kDisableQuic[];
 extern const char kDisableQuicHttps[];