Move Cloud Print Proxy UI back to about:flags.

BUG=59296, 59297
TEST=UI does not show up on Windows anymore unless you have the flag on.

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

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

2 files changed, 2 insertions, 19 deletions

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 3401cfb..b61f0ce 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -116,15 +116,7 @@ const Experiment kExperiments[] = {
     "cloud-print-proxy", // Do not change; see above.
     IDS_FLAGS_CLOUD_PRINT_PROXY_NAME,
     IDS_FLAGS_CLOUD_PRINT_PROXY_DESCRIPTION,
-#if defined(GOOGLE_CHROME_BUILD)
-    // For a Chrome build, we know we have a PDF plug-in, and so we'll
-    // enable by platform as we get things working.
-    0,
-#else
-    // Otherwise, where we know it could be working if a viable PDF
-    // plug-in could be supplied, we'll keep the lab enabled.
     kOsWin,
-#endif
     switches::kEnableCloudPrintProxy
   },
   {
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index 50ca605..e541c58 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -1673,17 +1673,8 @@ void AdvancedContentsView::InitControlLayout() {
   layout->AddView(new WebContentSection(profile()));
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(new SecuritySection(profile()));
-#if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
-  // We want to enable the cloud print UI on Windows. Since the cloud
-  // print proxy on Windows needs the PDF plugin, we only enable it by
-  // default on Google Chrome Windows builds (which contain the PDF
-  // plugin).
-  bool cloud_print_available = true;
-#else
-  bool cloud_print_available = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableCloudPrintProxy);
-#endif
-  if (cloud_print_available) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableCloudPrintProxy)) {
     layout->StartRow(0, single_column_view_set_id);
     layout->AddView(new CloudPrintProxySection(profile()));
   }