Revert 36098 because the UI team has decided on a different long-term direction for

the clear browsing data dialog.

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/542126

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

15 files changed, 12 insertions, 168 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index adae1e2..f9365f7 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3520,9 +3520,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_DEL_CACHE_CHKBOX" desc="Checkbox for deleting Cache">
         Empty the cache
       </message>
-      <message name="IDS_DEL_LOCAL_STORAGE_CHKBOX" desc="Checkbox for deleting Local Storage">
-        Delete local storage
-      </message>
       <message name="IDS_DEL_COOKIES_CHKBOX" desc="Checkbox for deleting Cookies">
         Delete cookies
       </message>
diff --git a/chrome/app/nibs/ClearBrowsingData.xib b/chrome/app/nibs/ClearBrowsingData.xib
index d121190..3497631 100644
--- a/chrome/app/nibs/ClearBrowsingData.xib
+++ b/chrome/app/nibs/ClearBrowsingData.xib
@@ -2,13 +2,12 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9L31a</string>
+		<string key="IBDocument.SystemVersion">9L30</string>
 		<string key="IBDocument.InterfaceBuilderVersion">677</string>
 		<string key="IBDocument.AppKitVersion">949.54</string>
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="103"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -44,7 +43,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<object class="NSView" key="NSWindowView" id="1006">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">292</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -151,7 +150,7 @@
 								<object class="NSButton" id="712572294">
 									<reference key="NSNextResponder" ref="874378538"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{18, 94}, {220, 32}}</string>
+									<string key="NSFrame">{{18, 89}, {220, 32}}</string>
 									<reference key="NSSuperview" ref="874378538"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="93196919">
@@ -175,32 +174,10 @@
 										<int key="NSPeriodicInterval">25</int>
 									</object>
 								</object>
-								<object class="NSButton" id="129136722">
-									<reference key="NSNextResponder" ref="874378538"/>
-									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{18, 73}, {220, 32}}</string>
-									<reference key="NSSuperview" ref="874378538"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="181605232">
-										<int key="NSCellFlags">67239424</int>
-										<int key="NSCellFlags2">0</int>
-										<string key="NSContents">^IDS_DEL_LOCAL_STORAGE_CHKBOX</string>
-										<reference key="NSSupport" ref="561508160"/>
-										<reference key="NSControlView" ref="129136722"/>
-										<int key="NSButtonFlags">1211912703</int>
-										<int key="NSButtonFlags2">130</int>
-										<reference key="NSNormalImage" ref="718055899"/>
-										<reference key="NSAlternateImage" ref="255044096"/>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">200</int>
-										<int key="NSPeriodicInterval">25</int>
-									</object>
-								</object>
 								<object class="NSButton" id="787203054">
 									<reference key="NSNextResponder" ref="874378538"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{18, 115}, {220, 32}}</string>
+									<string key="NSFrame">{{18, 114}, {220, 32}}</string>
 									<reference key="NSSuperview" ref="874378538"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="903695415">
@@ -222,7 +199,7 @@
 								<object class="NSButton" id="234232048">
 									<reference key="NSNextResponder" ref="874378538"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{18, 52}, {220, 32}}</string>
+									<string key="NSFrame">{{18, 64}, {220, 32}}</string>
 									<reference key="NSSuperview" ref="874378538"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="398687204">
@@ -244,7 +221,7 @@
 								<object class="NSButton" id="889683632">
 									<reference key="NSNextResponder" ref="874378538"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{18, 31}, {220, 32}}</string>
+									<string key="NSFrame">{{18, 38}, {220, 32}}</string>
 									<reference key="NSSuperview" ref="874378538"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="558713458">
@@ -266,7 +243,7 @@
 								<object class="NSButton" id="485872479">
 									<reference key="NSNextResponder" ref="874378538"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{18, 10}, {220, 32}}</string>
+									<string key="NSFrame">{{18, 12}, {220, 32}}</string>
 									<reference key="NSSuperview" ref="874378538"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="1025693685">
@@ -288,7 +265,7 @@
 								<object class="NSButton" id="94476998">
 									<reference key="NSNextResponder" ref="874378538"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{18, 136}, {220, 32}}</string>
+									<string key="NSFrame">{{18, 138}, {220, 32}}</string>
 									<reference key="NSSuperview" ref="874378538"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="317213760">
@@ -432,7 +409,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{331, 299}</string>
-					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -855,42 +831,6 @@
 					</object>
 					<int key="connectionID">113</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: deleteLocalStorage</string>
-						<reference key="source" ref="129136722"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="129136722"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: deleteLocalStorage</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">deleteLocalStorage</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">116</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: isClearing</string>
-						<reference key="source" ref="129136722"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="129136722"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">enabled: isClearing</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">isClearing</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSValueTransformerName</string>
-								<string key="NS.object.0">NSNegateBoolean</string>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">118</int>
-				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1025,7 +965,6 @@
 							<reference ref="889683632"/>
 							<reference ref="94476998"/>
 							<reference ref="485872479"/>
-							<reference ref="129136722"/>
 						</object>
 						<reference key="parent" ref="1006"/>
 					</object>
@@ -1197,20 +1136,6 @@
 						<reference key="object" ref="817836045"/>
 						<reference key="parent" ref="340114853"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">114</int>
-						<reference key="object" ref="129136722"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="181605232"/>
-						</object>
-						<reference key="parent" ref="874378538"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">115</int>
-						<reference key="object" ref="181605232"/>
-						<reference key="parent" ref="129136722"/>
-					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1227,8 +1152,6 @@
 					<string>1.WindowOrigin</string>
 					<string>1.editorWindowContentRectSynchronizationRect</string>
 					<string>11.IBPluginDependency</string>
-					<string>114.IBPluginDependency</string>
-					<string>115.IBPluginDependency</string>
 					<string>12.IBPluginDependency</string>
 					<string>13.IBPluginDependency</string>
 					<string>14.IBPluginDependency</string>
@@ -1281,8 +1204,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{725, 419}, {289, 83}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1328,7 +1249,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">118</int>
+			<int key="maxID">113</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1429,13 +1350,6 @@
 					<reference key="sourceIdentifier" ref="486988642"/>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">NSMenuItem</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/cocoa/nsmenuitem_additions.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
@@ -1449,13 +1363,6 @@
 						<string key="minorKey">browser/cocoa/tab_strip_model_observer_bridge.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSWindow</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">browser/cocoa/nswindow_local_state.h</string>
-					</object>
-				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 0f593bb..99e6e70 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -434,7 +434,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 f06aefc..92bf8eb 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1393,7 +1393,6 @@ void Browser::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true);
   prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true);
   prefs->RegisterBooleanPref(prefs::kDeleteCache, true);
-  prefs->RegisterBooleanPref(prefs::kDeleteLocalStorage, true);
   prefs->RegisterBooleanPref(prefs::kDeleteCookies, true);
   prefs->RegisterBooleanPref(prefs::kDeletePasswords, false);
   prefs->RegisterBooleanPref(prefs::kDeleteFormData, true);
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index 958d298..11581b9 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -112,10 +112,6 @@ void BrowsingDataRemover::Remove(int remove_mask) {
         profile_->GetRequestContext()->GetCookieStore()->GetCookieMonster();
     if (cookie_monster)
       cookie_monster->DeleteAllCreatedBetween(delete_begin_, delete_end_, true);
-  }
-
-  if (remove_mask & REMOVE_LOCAL_STORAGE) {
-    UserMetrics::RecordAction("ClearBrowsingData_LocalStorage", profile_);
     profile_->GetWebKitContext()->DeleteDataModifiedSince(delete_begin_);
   }
 
diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h
index a635c69..8fccfe0 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_LOCAL_STORAGE = 1 << 6;
 
   // 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/cocoa/clear_browsing_data_controller.h b/chrome/browser/cocoa/clear_browsing_data_controller.h
index d42f57b..3cc515b 100644
--- a/chrome/browser/cocoa/clear_browsing_data_controller.h
+++ b/chrome/browser/cocoa/clear_browsing_data_controller.h
@@ -39,7 +39,6 @@ extern NSString* const kClearBrowsingDataControllerRemoveMask;
   BOOL clearBrowsingHistory_;
   BOOL clearDownloadHistory_;
   BOOL emptyCache_;
-  BOOL deleteLocalStorage_;
   BOOL deleteCookies_;
   BOOL clearSavedPasswords_;
   BOOL clearFormData_;
@@ -64,7 +63,6 @@ extern NSString* const kClearBrowsingDataControllerRemoveMask;
 @property BOOL clearBrowsingHistory;
 @property BOOL clearDownloadHistory;
 @property BOOL emptyCache;
-@property BOOL deleteLocalStorage;
 @property BOOL deleteCookies;
 @property BOOL clearSavedPasswords;
 @property BOOL clearFormData;
diff --git a/chrome/browser/cocoa/clear_browsing_data_controller.mm b/chrome/browser/cocoa/clear_browsing_data_controller.mm
index 4e9e537..8f157f4 100644
--- a/chrome/browser/cocoa/clear_browsing_data_controller.mm
+++ b/chrome/browser/cocoa/clear_browsing_data_controller.mm
@@ -43,7 +43,6 @@ typedef std::map<Profile*, ClearBrowsingDataController*> ProfileControllerMap;
 @synthesize clearBrowsingHistory = clearBrowsingHistory_;
 @synthesize clearDownloadHistory = clearDownloadHistory_;
 @synthesize emptyCache = emptyCache_;
-@synthesize deleteLocalStorage = deleteLocalStorage_;
 @synthesize deleteCookies = deleteCookies_;
 @synthesize clearSavedPasswords = clearSavedPasswords_;
 @synthesize clearFormData = clearFormData_;
@@ -120,8 +119,6 @@ typedef std::map<Profile*, ClearBrowsingDataController*> ProfileControllerMap;
     removeMask |= BrowsingDataRemover::REMOVE_DOWNLOADS;
   if (emptyCache_)
     removeMask |= BrowsingDataRemover::REMOVE_CACHE;
-  if (deleteLocalStorage_)
-    removeMask |= BrowsingDataRemover::REMOVE_LOCAL_STORAGE;
   if (deleteCookies_)
      removeMask |= BrowsingDataRemover::REMOVE_COOKIES;
   if (clearSavedPasswords_)
@@ -174,7 +171,6 @@ typedef std::map<Profile*, ClearBrowsingDataController*> ProfileControllerMap;
   [self setClearDownloadHistory:
       prefs->GetBoolean(prefs::kDeleteDownloadHistory)];
   [self setEmptyCache:prefs->GetBoolean(prefs::kDeleteCache)];
-  [self setDeleteLocalStorage:prefs->GetBoolean(prefs::kDeleteLocalStorage)];
   [self setDeleteCookies:prefs->GetBoolean(prefs::kDeleteCookies)];
   [self setClearSavedPasswords:prefs->GetBoolean(prefs::kDeletePasswords)];
   [self setClearFormData:prefs->GetBoolean(prefs::kDeleteFormData)];
@@ -189,7 +185,6 @@ typedef std::map<Profile*, ClearBrowsingDataController*> ProfileControllerMap;
   prefs->SetBoolean(prefs::kDeleteDownloadHistory,
                     [self clearDownloadHistory]);
   prefs->SetBoolean(prefs::kDeleteCache, [self emptyCache]);
-  prefs->SetBoolean(prefs::kDeleteLocalStorage, [self deleteLocalStorage]);
   prefs->SetBoolean(prefs::kDeleteCookies, [self deleteCookies]);
   prefs->SetBoolean(prefs::kDeletePasswords, [self clearSavedPasswords]);
   prefs->SetBoolean(prefs::kDeleteFormData, [self clearFormData]);
diff --git a/chrome/browser/cocoa/clear_browsing_data_controller_unittest.mm b/chrome/browser/cocoa/clear_browsing_data_controller_unittest.mm
index e4dfd35..48e1c81 100644
--- a/chrome/browser/cocoa/clear_browsing_data_controller_unittest.mm
+++ b/chrome/browser/cocoa/clear_browsing_data_controller_unittest.mm
@@ -27,7 +27,6 @@ class ClearBrowsingDataControllerTest : public CocoaTest {
     prefs->SetBoolean(prefs::kDeleteBrowsingHistory, true);
     prefs->SetBoolean(prefs::kDeleteDownloadHistory, false);
     prefs->SetBoolean(prefs::kDeleteCache, true);
-    prefs->SetBoolean(prefs::kDeleteLocalStorage, true);
     prefs->SetBoolean(prefs::kDeleteCookies, false);
     prefs->SetBoolean(prefs::kDeletePasswords, true);
     prefs->SetBoolean(prefs::kDeleteFormData, false);
@@ -51,7 +50,6 @@ TEST_F(ClearBrowsingDataControllerTest, InitialState) {
   EXPECT_TRUE([controller_ clearBrowsingHistory]);
   EXPECT_FALSE([controller_ clearDownloadHistory]);
   EXPECT_TRUE([controller_ emptyCache]);
-  EXPECT_TRUE([controller_ deleteLocalStorage]);
   EXPECT_FALSE([controller_ deleteCookies]);
   EXPECT_TRUE([controller_ clearSavedPasswords]);
   EXPECT_FALSE([controller_ clearFormData]);
@@ -63,7 +61,6 @@ TEST_F(ClearBrowsingDataControllerTest, InitialRemoveMask) {
   // Check that the remove-mask matches the initial properties:
   EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY |
                 BrowsingDataRemover::REMOVE_CACHE |
-                BrowsingDataRemover::REMOVE_LOCAL_STORAGE |
                 BrowsingDataRemover::REMOVE_PASSWORDS,
             [controller_ removeMask]);
 }
@@ -73,7 +70,6 @@ TEST_F(ClearBrowsingDataControllerTest, ModifiedRemoveMask) {
   [controller_ setClearBrowsingHistory:false];
   [controller_ setClearDownloadHistory:true];
   [controller_ setEmptyCache:false];
-  [controller_ setDeleteLocalStorage:false];
   [controller_ setDeleteCookies:true];
   [controller_ setClearSavedPasswords:false];
   [controller_ setClearFormData:true];
@@ -89,7 +85,6 @@ TEST_F(ClearBrowsingDataControllerTest, EmptyRemoveMask) {
   [controller_ setClearBrowsingHistory:false];
   [controller_ setClearDownloadHistory:false];
   [controller_ setEmptyCache:false];
-  [controller_ setDeleteLocalStorage:false];
   [controller_ setDeleteCookies:false];
   [controller_ setClearSavedPasswords:false];
   [controller_ setClearFormData:false];
@@ -111,7 +106,6 @@ TEST_F(ClearBrowsingDataControllerTest, PersistToPrefs) {
 
   // Make sure the rest of the prefs didn't change:
   EXPECT_TRUE(prefs->GetBoolean(prefs::kDeleteCache));
-  EXPECT_TRUE(prefs->GetBoolean(prefs::kDeleteLocalStorage));
   EXPECT_FALSE(prefs->GetBoolean(prefs::kDeleteCookies));
   EXPECT_TRUE(prefs->GetBoolean(prefs::kDeletePasswords));
   EXPECT_FALSE(prefs->GetBoolean(prefs::kDeleteFormData));
diff --git a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc
index 2064241..5eb75a1 100644
--- a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc
+++ b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc
@@ -78,16 +78,6 @@ ClearBrowsingDataDialogGtk::ClearBrowsingDataDialogGtk(GtkWindow* parent,
   g_signal_connect(del_cache_checkbox_, "toggled",
                    G_CALLBACK(HandleOnClickedWidget), this);
 
-  // Local Storage checkbox.
-  del_local_storage_checkbox_ = gtk_check_button_new_with_label(
-      l10n_util::GetStringUTF8(IDS_DEL_LOCAL_STORAGE_CHKBOX).c_str());
-  gtk_box_pack_start(GTK_BOX(vbox), del_local_storage_checkbox_,
-                     FALSE, FALSE, 0);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(del_local_storage_checkbox_),
-      profile_->GetPrefs()->GetBoolean(prefs::kDeleteLocalStorage));
-  g_signal_connect(del_local_storage_checkbox_, "toggled",
-                   G_CALLBACK(HandleOnClickedWidget), this);
-
   // Cookies checkbox.
   del_cookies_checkbox_ = gtk_check_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_DEL_COOKIES_CHKBOX).c_str());
@@ -171,10 +161,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_local_storage_checkbox_))) {
-      items |= BrowsingDataRemover::REMOVE_LOCAL_STORAGE;
-    }
 
     // BrowsingDataRemover deletes itself when done.
     remover_ = new BrowsingDataRemover(profile_,
@@ -200,10 +186,6 @@ void ClearBrowsingDataDialogGtk::OnDialogWidgetClicked(GtkWidget* widget) {
     profile_->GetPrefs()->SetBoolean(prefs::kDeleteCache,
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ?
         true : false);
-  } else if (widget == del_local_storage_checkbox_) {
-    profile_->GetPrefs()->SetBoolean(prefs::kDeleteLocalStorage,
-        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ?
-        true : false);
   } else if (widget == del_cookies_checkbox_) {
     profile_->GetPrefs()->SetBoolean(prefs::kDeleteCookies,
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ?
diff --git a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.h b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.h
index 50da842..46a3c73 100644
--- a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.h
+++ b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.h
@@ -41,7 +41,6 @@ class ClearBrowsingDataDialogGtk {
   GtkWidget* del_history_checkbox_;
   GtkWidget* del_downloads_checkbox_;
   GtkWidget* del_cache_checkbox_;
-  GtkWidget* del_local_storage_checkbox_;
   GtkWidget* del_cookies_checkbox_;
   GtkWidget* del_passwords_checkbox_;
   GtkWidget* del_form_data_checkbox_;
diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index 54bb6e7..8b94636 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -44,7 +44,6 @@ ClearBrowsingDataView::ClearBrowsingDataView(Profile* profile)
     : del_history_checkbox_(NULL),
       del_downloads_checkbox_(NULL),
       del_cache_checkbox_(NULL),
-      del_local_storage_checkbox_(NULL),
       del_cookies_checkbox_(NULL),
       del_passwords_checkbox_(NULL),
       del_form_data_checkbox_(NULL),
@@ -95,10 +94,6 @@ void ClearBrowsingDataView::Init() {
       AddCheckbox(l10n_util::GetString(IDS_DEL_CACHE_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeleteCache));
 
-  del_local_storage_checkbox_ =
-      AddCheckbox(l10n_util::GetString(IDS_DEL_LOCAL_STORAGE_CHKBOX),
-      profile_->GetPrefs()->GetBoolean(prefs::kDeleteLocalStorage));
-
   del_cookies_checkbox_ =
       AddCheckbox(l10n_util::GetString(IDS_DEL_COOKIES_CHKBOX),
       profile_->GetPrefs()->GetBoolean(prefs::kDeleteCookies));
@@ -163,17 +158,10 @@ void ClearBrowsingDataView::Layout() {
                                      kRelatedControlVerticalSpacing,
                                  sz.width(), sz.height());
 
-  sz = del_local_storage_checkbox_->GetPreferredSize();
-  del_local_storage_checkbox_->SetBounds(2 * kPanelHorizMargin,
-                                         del_cache_checkbox_->y() +
-                                             del_cache_checkbox_->height() +
-                                             kRelatedControlVerticalSpacing,
-                                         sz.width(), sz.height());
-
   sz = del_cookies_checkbox_->GetPreferredSize();
   del_cookies_checkbox_->SetBounds(2 * kPanelHorizMargin,
-                                   del_local_storage_checkbox_->y() +
-                                       del_local_storage_checkbox_->height() +
+                                   del_cache_checkbox_->y() +
+                                       del_cache_checkbox_->height() +
                                        kRelatedControlVerticalSpacing,
                                    sz.width(), sz.height());
 
@@ -280,7 +268,6 @@ bool ClearBrowsingDataView::IsDialogButtonEnabled(
     return del_history_checkbox_->checked() ||
            del_downloads_checkbox_->checked() ||
            del_cache_checkbox_->checked() ||
-           del_local_storage_checkbox_->checked() ||
            del_cookies_checkbox_->checked() ||
            del_passwords_checkbox_->checked() ||
            del_form_data_checkbox_->checked();
@@ -367,9 +354,6 @@ void ClearBrowsingDataView::ButtonPressed(
   else if (sender == del_cache_checkbox_)
     profile_->GetPrefs()->SetBoolean(prefs::kDeleteCache,
         del_cache_checkbox_->checked() ? true : false);
-  else if (sender == del_local_storage_checkbox_)
-    profile_->GetPrefs()->SetBoolean(prefs::kDeleteLocalStorage,
-        del_local_storage_checkbox_->checked() ? true : false);
   else if (sender == del_cookies_checkbox_)
     profile_->GetPrefs()->SetBoolean(prefs::kDeleteCookies,
         del_cookies_checkbox_->checked() ? true : false);
@@ -403,7 +387,6 @@ void ClearBrowsingDataView::UpdateControlEnabledState() {
   del_history_checkbox_->SetEnabled(!delete_in_progress_);
   del_downloads_checkbox_->SetEnabled(!delete_in_progress_);
   del_cache_checkbox_->SetEnabled(!delete_in_progress_);
-  del_local_storage_checkbox_->SetEnabled(!delete_in_progress_);
   del_cookies_checkbox_->SetEnabled(!delete_in_progress_);
   del_passwords_checkbox_->SetEnabled(!delete_in_progress_);
   del_form_data_checkbox_->SetEnabled(!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_local_storage_checkbox_))
-    remove_mask |= BrowsingDataRemover::REMOVE_LOCAL_STORAGE;
 
   delete_in_progress_ = true;
   UpdateControlEnabledState();
diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h
index 310b487..cf0df5f 100644
--- a/chrome/browser/views/clear_browsing_data.h
+++ b/chrome/browser/views/clear_browsing_data.h
@@ -99,7 +99,6 @@ class ClearBrowsingDataView : public views::View,
   views::Checkbox* del_history_checkbox_;
   views::Checkbox* del_downloads_checkbox_;
   views::Checkbox* del_cache_checkbox_;
-  views::Checkbox* del_local_storage_checkbox_;
   views::Checkbox* del_cookies_checkbox_;
   views::Checkbox* del_passwords_checkbox_;
   views::Checkbox* del_form_data_checkbox_;
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 84f9267..2d2970a 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -212,7 +212,6 @@ const wchar_t kDeleteBrowsingHistory[] = L"browser.clear_data.browsing_history";
 const wchar_t kDeleteDownloadHistory[] =
     L"browser.clear_data.download_history";
 const wchar_t kDeleteCache[] = L"browser.clear_data.cache";
-const wchar_t kDeleteLocalStorage[] = L"browser.clear_data.local_storage";
 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";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 3331a0ca..622825a 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -79,7 +79,6 @@ extern const wchar_t kRecentlySelectedEncoding[];
 extern const wchar_t kDeleteBrowsingHistory[];
 extern const wchar_t kDeleteDownloadHistory[];
 extern const wchar_t kDeleteCache[];
-extern const wchar_t kDeleteLocalStorage[];
 extern const wchar_t kDeleteCookies[];
 extern const wchar_t kDeletePasswords[];
 extern const wchar_t kDeleteFormData[];