Add UI to the Clear Browsing Data dialog to remove Flash LSO data.

chrome/browser/ui/views/clear_browsing_data_view.cc

Index: chrome/browser/ui/views/clear_browsing_data_view.cc
diff --git a/chrome/browser/ui/views/clear_browsing_data_view.cc b/chrome/browser/ui/views/clear_browsing_data_view.cc
index 1aec28661d39e1b1ba480b0984d16d6337eb9251..dd0618098386ea72495887dc260a6e65bc02e96d 100644
--- a/chrome/browser/ui/views/clear_browsing_data_view.cc
+++ b/chrome/browser/ui/views/clear_browsing_data_view.cc
@@ -52,6 +52,7 @@ ClearBrowsingDataView2::ClearBrowsingDataView2(Profile* profile,
       del_cache_checkbox_(NULL),
       del_cookies_checkbox_(NULL),
       del_passwords_checkbox_(NULL),
+      del_lso_data_checkbox_(NULL),
       del_form_data_checkbox_(NULL),
       time_period_label_(NULL),
       time_period_combobox_(NULL),
@@ -111,6 +112,10 @@ void ClearBrowsingDataView2::Init() {
       AddCheckbox(l10n_util::GetString(IDS_DEL_PASSWORDS_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeletePasswords));
 
+  del_lso_data_checkbox_ =
+      AddCheckbox(l10n_util::GetString(IDS_DEL_FLASH_DATA_CHKBOX),
+      profile_->GetPrefs()->GetBoolean(prefs::kDeleteLSOData));
+
   del_form_data_checkbox_ =
       AddCheckbox(l10n_util::GetString(IDS_DEL_FORM_DATA_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeleteFormData));
@@ -208,6 +213,10 @@ void ClearBrowsingDataView2::InitControlLayout() {
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, indented_column_set_id);
+  layout->AddView(del_lso_data_checkbox_);
+  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+
+  layout->StartRow(0, indented_column_set_id);
   layout->AddView(del_form_data_checkbox_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
@@ -275,6 +284,8 @@ void ClearBrowsingDataView2::ButtonPressed(
         del_cookies_checkbox_->checked() ? true : false);
     profile_->GetPrefs()->SetBoolean(prefs::kDeletePasswords,
         del_passwords_checkbox_->checked() ? true : false);
+    profile_->GetPrefs()->SetBoolean(prefs::kDeleteLSOData,
+        del_lso_data_checkbox_->checked() ? true : false);
     profile_->GetPrefs()->SetBoolean(prefs::kDeleteFormData,
         del_form_data_checkbox_->checked() ? true : false);
     clear_data_parent_window_->StartClearingBrowsingData();
@@ -311,6 +322,7 @@ void ClearBrowsingDataView2::UpdateControlEnabledState() {
   del_cache_checkbox_->SetEnabled(!delete_in_progress_);
   del_cookies_checkbox_->SetEnabled(!delete_in_progress_);
   del_passwords_checkbox_->SetEnabled(!delete_in_progress_);
+  del_lso_data_checkbox_->SetEnabled(!delete_in_progress_);
   del_form_data_checkbox_->SetEnabled(!delete_in_progress_);
   time_period_combobox_->SetEnabled(!delete_in_progress_);
 
@@ -329,6 +341,7 @@ void ClearBrowsingDataView2::UpdateControlEnabledState() {
            del_cache_checkbox_->checked() ||
            del_cookies_checkbox_->checked() ||
            del_passwords_checkbox_->checked() ||
+           del_lso_data_checkbox_->checked() ||
            del_form_data_checkbox_->checked()));
 }
 
@@ -350,6 +363,8 @@ void ClearBrowsingDataView2::OnDelete() {
     remove_mask |= BrowsingDataRemover::REMOVE_COOKIES;
   if (IsCheckBoxEnabledAndSelected(del_passwords_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS;
+  if (IsCheckBoxEnabledAndSelected(del_lso_data_checkbox_))
+    remove_mask |= BrowsingDataRemover::REMOVE_LSO_DATA;
   if (IsCheckBoxEnabledAndSelected(del_form_data_checkbox_))
     remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA;
   if (IsCheckBoxEnabledAndSelected(del_cache_checkbox_))