[GTK] enable spoof proof infobars by default.

BUG=60110
TEST=manual

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

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

5 files changed, 0 insertions, 27 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index dc81bf0..4c4741a 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4103,12 +4103,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_DNS_SERVER_DESCRIPTION" desc="">
         User specified DNS server, which Chrome will use for DNS resolutions rather than the system defaults.
       </message>
-      <message name="IDS_FLAGS_SECURE_INFOBARS_NAME" desc="Name of the 'Infobar refresh' lab.">
-        Infobar refresh
-      </message>
-      <message name="IDS_FLAGS_SECURE_INFOBARS_DESCRIPTION" desc="Description of the 'Infobar Refresh' lab.">
-        Adds some visual hinting to infobars that makes them impossible for websites to spoof.
-      </message>
 
       <!-- Instant -->
       <message name="IDS_INSTANT_OPT_IN_ENABLE" desc="Button shown in the omnibox dropdown for enabling instant">
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index c710012..277177b 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -143,13 +143,6 @@ const Experiment kExperiments[] = {
     kOsLinux,
     switches::kDnsServer
   },
-  {
-    "secure-infobars",  // Do not change; see above
-    IDS_FLAGS_SECURE_INFOBARS_NAME,
-    IDS_FLAGS_SECURE_INFOBARS_DESCRIPTION,
-    kOsAll,
-    switches::kEnableSecureInfoBars
-  }
 };
 
 const Experiment* experiments = kExperiments;
diff --git a/chrome/browser/gtk/infobar_container_gtk.cc b/chrome/browser/gtk/infobar_container_gtk.cc
index b53a995..b5c95e3 100644
--- a/chrome/browser/gtk/infobar_container_gtk.cc
+++ b/chrome/browser/gtk/infobar_container_gtk.cc
@@ -145,11 +145,6 @@ void InfoBarContainerGtk::UpdateInfoBars() {
 
 void InfoBarContainerGtk::ShowArrowForDelegate(InfoBarDelegate* delegate,
                                                bool animate) {
-  if (!CommandLine::ForCurrentProcess()->
-          HasSwitch(switches::kEnableSecureInfoBars)) {
-    return;
-  }
-
   GList* children = gtk_container_get_children(GTK_CONTAINER(widget()));
   if (!children)
     return;
@@ -216,11 +211,6 @@ void InfoBarContainerGtk::RemoveInfoBar(InfoBarDelegate* delegate,
 
 void InfoBarContainerGtk::UpdateToolbarInfoBarState(
     InfoBar* infobar, bool animate) {
-  if (!CommandLine::ForCurrentProcess()->
-          HasSwitch(switches::kEnableSecureInfoBars)) {
-    return;
-  }
-
   GtkWindow* parent = platform_util::GetTopLevel(widget());
   BrowserWindowGtk* browser_window =
       BrowserWindowGtk::GetBrowserWindowForNativeWindow(parent);
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index fd35555..1098878 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -477,9 +477,6 @@ const char kEnablePrintPreview[]            = "enable-print-preview";
 // parameter to indicate if the provider should be the default.
 const char kEnableSearchProviderApiV2[]     = "enable-search-provider-api-v2";
 
-// Enables the secure infobars. Non-default until the kinks are worked out.
-const char kEnableSecureInfoBars[]          = "enable-secure-infobars";
-
 // Enables 0-RTT HTTPS handshakes.
 const char kEnableSnapStart[]               = "enable-snap-start";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 6d8bb63..4dff38b 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -146,7 +146,6 @@ extern const char kEnablePrintPreview[];
 extern const char kEnableRemoting[];
 extern const char kEnableResourceContentSettings[];
 extern const char kEnableSearchProviderApiV2[];
-extern const char kEnableSecureInfoBars[];
 extern const char kEnableSnapStart[];
 extern const char kEnableStatsTable[];
 extern const char kEnableSync[];