Revert "Strict transport security: add checkbox to clear state."

This reverts commit r25955.


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

11 files changed, 4 insertions, 57 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index cbec99a..2adfbd8 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -2737,9 +2737,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_DEL_FORM_DATA_CHKBOX" desc="Checkbox for deleting form data saved for autofill">
         Clear saved form data
       </message>
-      <message name="IDS_DEL_STS_STATE" desc="Checkbox for deleting Strict Transport Security state. Strict Transport Security is a protocol name (like File Transfer Protocol) so one may choose to leave it untranslated.">
-        Clear Strict-Transport-Security state
-      </message>
       <message name="IDS_CLEAR_BROWSING_DATA_COMMIT" desc="Text for OK button on dialog">
         Clear Browsing Data
       </message>
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 9b825b8..d1251a7 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -375,7 +375,7 @@
         63
       </message>
       <message name="IDS_CLEARDATA_DIALOG_HEIGHT_LINES" use_name_for_id="true">
-        18
+        16
       </message>
 
       <!-- The width and height of the Import dialog box in characters and lines (See -->
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index ea14851..88cf354 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1315,7 +1315,6 @@ void Browser::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kDeleteCookies, true);
   prefs->RegisterBooleanPref(prefs::kDeletePasswords, false);
   prefs->RegisterBooleanPref(prefs::kDeleteFormData, true);
-  prefs->RegisterBooleanPref(prefs::kDeleteSTSState, false);
   prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0);
   prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true);
   prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true);
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index b971187..96e1543 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/notification_service.h"
 #include "net/base/cookie_monster.h"
-#include "net/base/strict_transport_security_state.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_context.h"
@@ -148,14 +147,6 @@ void BrowsingDataRemover::Remove(int remove_mask) {
     }
   }
 
-  if (remove_mask & REMOVE_STS_STATE) {
-    UserMetrics::RecordAction(L"ClearBrowsingData_STSState", profile_);
-
-    net::StrictTransportSecurityState* sts_state =
-        profile_->GetStrictTransportSecurityState();
-    sts_state->Clear();
-  }
-
   NotifyAndDeleteIfDone();
 }
 
diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h
index 841358b..0425c6f 100644
--- a/chrome/browser/browsing_data_remover.h
+++ b/chrome/browser/browsing_data_remover.h
@@ -35,7 +35,6 @@ class BrowsingDataRemover : public NotificationObserver {
   static const int REMOVE_PASSWORDS = 1 << 3;
   static const int REMOVE_FORM_DATA = 1 << 4;
   static const int REMOVE_CACHE = 1 << 5;
-  static const int REMOVE_STS_STATE = 1 << 6;  // always removes everything.
 
   // Observer is notified when the removal is done. Done means keywords have
   // been deleted, cache cleared and all other tasks scheduled.
diff --git a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc
index 9e07795..07b911d 100644
--- a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc
+++ b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc
@@ -99,15 +99,6 @@ ClearBrowsingDataDialogGtk::ClearBrowsingDataDialogGtk(GtkWindow* parent,
   g_signal_connect(del_form_data_checkbox_, "toggled",
                    G_CALLBACK(HandleOnClickedWidget), this);
 
-  // Strict transport security state checkbox.
-  del_sts_checkbox_ = gtk_check_button_new_with_label(
-      l10n_util::GetStringUTF8(IDS_DEL_STS_STATE).c_str());
-  gtk_box_pack_start(GTK_BOX(vbox), del_sts_checkbox_, FALSE, FALSE, 0);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(del_sts_checkbox_),
-      profile_->GetPrefs()->GetBoolean(prefs::kDeleteSTSState));
-  g_signal_connect(del_sts_checkbox_, "toggled",
-                   G_CALLBACK(HandleOnClickedWidget), this);
-
   // Create a horizontal layout for the combo box and label.
   GtkWidget* combo_hbox = gtk_hbox_new(FALSE, gtk_util::kLabelSpacing);
   GtkWidget* time_period_label_ = gtk_label_new(
@@ -166,9 +157,6 @@ void ClearBrowsingDataDialogGtk::OnDialogResponse(GtkWidget* widget,
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(del_cache_checkbox_)))
       items |= BrowsingDataRemover::REMOVE_CACHE;
 
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(del_sts_checkbox_)))
-      items |= BrowsingDataRemover::REMOVE_STS_STATE;
-
     // BrowsingDataRemover deletes itself when done.
     remover_ = new BrowsingDataRemover(profile_,
         static_cast<BrowsingDataRemover::TimePeriod>(period_selected),
@@ -205,10 +193,6 @@ void ClearBrowsingDataDialogGtk::OnDialogWidgetClicked(GtkWidget* widget) {
     profile_->GetPrefs()->SetBoolean(prefs::kDeleteFormData,
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ?
         true : false);
-  } else if (widget == del_sts_checkbox_) {
-    profile_->GetPrefs()->SetBoolean(prefs::kDeleteSTSState,
-        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ?
-        true : false);
   } else if (widget == time_period_combobox_) {
     profile_->GetPrefs()->SetInteger(prefs::kDeleteTimePeriod,
         gtk_combo_box_get_active(GTK_COMBO_BOX(widget)));
diff --git a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.h b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.h
index 794cfe0..46a3c73 100644
--- a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.h
+++ b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.h
@@ -44,7 +44,6 @@ class ClearBrowsingDataDialogGtk {
   GtkWidget* del_cookies_checkbox_;
   GtkWidget* del_passwords_checkbox_;
   GtkWidget* del_form_data_checkbox_;
-  GtkWidget* del_sts_checkbox_;
   GtkWidget* time_period_combobox_;
 
   // Our current profile.
diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index 619592f..322543e 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -47,7 +47,6 @@ ClearBrowsingDataView::ClearBrowsingDataView(Profile* profile)
       del_cookies_checkbox_(NULL),
       del_passwords_checkbox_(NULL),
       del_form_data_checkbox_(NULL),
-      del_sts_checkbox_(NULL),
       time_period_label_(NULL),
       time_period_combobox_(NULL),
       delete_in_progress_(false),
@@ -107,10 +106,6 @@ void ClearBrowsingDataView::Init() {
       AddCheckbox(l10n_util::GetString(IDS_DEL_FORM_DATA_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeleteFormData));
 
-  del_sts_checkbox_ =
-      AddCheckbox(l10n_util::GetString(IDS_DEL_STS_STATE),
-      profile_->GetPrefs()->GetBoolean(prefs::kDeleteSTSState));
-
   // Add a label which appears before the combo box for the time period.
   time_period_label_ = new views::Label(
       l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_TIME_LABEL));
@@ -184,18 +179,11 @@ void ClearBrowsingDataView::Layout() {
                                          kRelatedControlVerticalSpacing,
                                      sz.width(), sz.height());
 
-  sz = del_sts_checkbox_->GetPreferredSize();
-  del_sts_checkbox_->SetBounds(2 * kPanelHorizMargin,
-                               del_form_data_checkbox_->y() +
-                                   del_form_data_checkbox_->height() +
-                                   kRelatedControlVerticalSpacing,
-                               sz.width(), sz.height());
-
   // Time period label is next below the combo boxes.
   sz = time_period_label_->GetPreferredSize();
   time_period_label_->SetBounds(kPanelHorizMargin,
-                                del_sts_checkbox_->y() +
-                                    del_sts_checkbox_->height() +
+                                del_form_data_checkbox_->y() +
+                                    del_form_data_checkbox_->height() +
                                     kRelatedControlVerticalSpacing +
                                     kExtraMarginForTimePeriodLabel,
                                 sz.width(), sz.height());
@@ -282,8 +270,7 @@ bool ClearBrowsingDataView::IsDialogButtonEnabled(
            del_cache_checkbox_->checked() ||
            del_cookies_checkbox_->checked() ||
            del_passwords_checkbox_->checked() ||
-           del_form_data_checkbox_->checked() ||
-           del_sts_checkbox_->checked();
+           del_form_data_checkbox_->checked();
   }
 
   return true;
@@ -376,9 +363,6 @@ void ClearBrowsingDataView::ButtonPressed(
   else if (sender == del_form_data_checkbox_)
     profile_->GetPrefs()->SetBoolean(prefs::kDeleteFormData,
         del_form_data_checkbox_->checked() ? true : false);
-  else if (sender == del_sts_checkbox_)
-    profile_->GetPrefs()->SetBoolean(prefs::kDeleteSTSState,
-        del_sts_checkbox_->checked() ? true : false);
 
   // When no checkbox is checked we should not have the action button enabled.
   // This forces the button to evaluate what state they should be in.
@@ -406,7 +390,6 @@ void ClearBrowsingDataView::UpdateControlEnabledState() {
   del_cookies_checkbox_->SetEnabled(!delete_in_progress_);
   del_passwords_checkbox_->SetEnabled(!delete_in_progress_);
   del_form_data_checkbox_->SetEnabled(!delete_in_progress_);
-  del_sts_checkbox_->SetEnabled(!delete_in_progress_);
   time_period_combobox_->SetEnabled(!delete_in_progress_);
 
   status_label_.SetVisible(delete_in_progress_);
@@ -442,8 +425,6 @@ void ClearBrowsingDataView::OnDelete() {
     remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
   if (IsCheckBoxEnabledAndSelected(del_cache_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
-  if (IsCheckBoxEnabledAndSelected(del_sts_checkbox_))
-    remove_mask |= BrowsingDataRemover::REMOVE_STS_STATE;
 
   delete_in_progress_ = true;
   UpdateControlEnabledState();
diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h
index 61375d2..cf0df5f 100644
--- a/chrome/browser/views/clear_browsing_data.h
+++ b/chrome/browser/views/clear_browsing_data.h
@@ -102,7 +102,6 @@ class ClearBrowsingDataView : public views::View,
   views::Checkbox* del_cookies_checkbox_;
   views::Checkbox* del_passwords_checkbox_;
   views::Checkbox* del_form_data_checkbox_;
-  views::Checkbox* del_sts_checkbox_;
   views::Label* time_period_label_;
   views::Combobox* time_period_combobox_;
 
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index ea9ebed..6724092 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -219,7 +219,6 @@ const wchar_t kDeleteCache[] = L"browser.clear_data.cache";
 const wchar_t kDeleteCookies[] = L"browser.clear_data.cookies";
 const wchar_t kDeletePasswords[] = L"browser.clear_data.passwords";
 const wchar_t kDeleteFormData[] = L"browser.clear_data.form_data";
-const wchar_t kDeleteSTSState[] = L"browser.clear_data.sts_state";
 const wchar_t kDeleteTimePeriod[] = L"browser.clear_data.time_period";
 
 // Integer prefs giving the widths of the columns in the bookmark table. Two
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 75236c9..cd496d0 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -83,7 +83,6 @@ extern const wchar_t kDeleteCache[];
 extern const wchar_t kDeleteCookies[];
 extern const wchar_t kDeletePasswords[];
 extern const wchar_t kDeleteFormData[];
-extern const wchar_t kDeleteSTSState[];
 extern const wchar_t kBookmarkTableNameWidth1[];
 extern const wchar_t kBookmarkTableURLWidth1[];
 extern const wchar_t kBookmarkTableNameWidth2[];