Remove "name" field from indexed databases.

BUG=56248
TEST=unit_tests

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

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

24 files changed, 167 insertions, 423 deletions

diff --git a/chrome/app/nibs/CookieDetailsView.xib b/chrome/app/nibs/CookieDetailsView.xib
index 38cfe7e5..f1e0940 100644
--- a/chrome/app/nibs/CookieDetailsView.xib
+++ b/chrome/app/nibs/CookieDetailsView.xib
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="771"/>
+			<integer value="772"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -802,166 +802,6 @@
 								<string key="NSFrame">{{10, 10}, {444, 171}}</string>
 								<reference key="NSSuperview" ref="652669668"/>
 							</object>
-							<object class="NSView" id="145445589">
-								<reference key="NSNextResponder" ref="652669668"/>
-								<int key="NSvFlags">-2147483382</int>
-								<object class="NSMutableArray" key="NSSubviews">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<object class="NSCustomView" id="385588554">
-										<reference key="NSNextResponder" ref="145445589"/>
-										<int key="NSvFlags">292</int>
-										<object class="NSMutableArray" key="NSSubviews">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSTextField" id="291143228">
-												<reference key="NSNextResponder" ref="385588554"/>
-												<int key="NSvFlags">267</int>
-												<string key="NSFrame">{{0, 79}, {100, 17}}</string>
-												<reference key="NSSuperview" ref="385588554"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="10774955">
-													<int key="NSCellFlags">68288064</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents">^IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL</string>
-													<reference key="NSSupport" ref="284921973"/>
-													<reference key="NSControlView" ref="291143228"/>
-													<reference key="NSBackgroundColor" ref="949329157"/>
-													<object class="NSColor" key="NSTextColor">
-														<int key="NSColorSpace">1</int>
-														<bytes key="NSRGB">MCAwIDAAA</bytes>
-													</object>
-												</object>
-											</object>
-											<object class="NSTextField" id="999350559">
-												<reference key="NSNextResponder" ref="385588554"/>
-												<int key="NSvFlags">267</int>
-												<string key="NSFrame">{{0, 104}, {100, 17}}</string>
-												<reference key="NSSuperview" ref="385588554"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="815112122">
-													<int key="NSCellFlags">68288064</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents">^IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL</string>
-													<reference key="NSSupport" ref="284921973"/>
-													<reference key="NSControlView" ref="999350559"/>
-													<reference key="NSBackgroundColor" ref="949329157"/>
-													<reference key="NSTextColor" ref="503975814"/>
-												</object>
-											</object>
-											<object class="NSTextField" id="329087810">
-												<reference key="NSNextResponder" ref="385588554"/>
-												<int key="NSvFlags">267</int>
-												<string key="NSFrame">{{0, 129}, {100, 17}}</string>
-												<reference key="NSSuperview" ref="385588554"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="8708799">
-													<int key="NSCellFlags">68288064</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents">^IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL</string>
-													<reference key="NSSupport" ref="284921973"/>
-													<reference key="NSControlView" ref="329087810"/>
-													<reference key="NSBackgroundColor" ref="949329157"/>
-													<reference key="NSTextColor" ref="503975814"/>
-												</object>
-											</object>
-											<object class="NSTextField" id="435875977">
-												<reference key="NSNextResponder" ref="385588554"/>
-												<int key="NSvFlags">267</int>
-												<string key="NSFrame">{{0, 154}, {100, 17}}</string>
-												<reference key="NSSuperview" ref="385588554"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="911512308">
-													<int key="NSCellFlags">68288064</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents">^IDS_COOKIES_COOKIE_NAME_LABEL</string>
-													<reference key="NSSupport" ref="284921973"/>
-													<reference key="NSControlView" ref="435875977"/>
-													<reference key="NSBackgroundColor" ref="949329157"/>
-													<reference key="NSTextColor" ref="503975814"/>
-												</object>
-											</object>
-										</object>
-										<string key="NSFrameSize">{100, 171}</string>
-										<reference key="NSSuperview" ref="145445589"/>
-										<string key="NSClassName">GTMWidthBasedTweaker</string>
-									</object>
-									<object class="NSCustomView" id="318940040">
-										<reference key="NSNextResponder" ref="145445589"/>
-										<int key="NSvFlags">292</int>
-										<object class="NSMutableArray" key="NSSubviews">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSTextField" id="1007372376">
-												<reference key="NSNextResponder" ref="318940040"/>
-												<int key="NSvFlags">266</int>
-												<string key="NSFrame">{{3, 79}, {341, 17}}</string>
-												<reference key="NSSuperview" ref="318940040"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="825309367">
-													<int key="NSCellFlags">70385217</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents">Label</string>
-													<reference key="NSSupport" ref="123687714"/>
-													<reference key="NSControlView" ref="1007372376"/>
-													<reference key="NSBackgroundColor" ref="949329157"/>
-													<reference key="NSTextColor" ref="503975814"/>
-												</object>
-											</object>
-											<object class="NSTextField" id="999332982">
-												<reference key="NSNextResponder" ref="318940040"/>
-												<int key="NSvFlags">266</int>
-												<string key="NSFrame">{{3, 104}, {341, 17}}</string>
-												<reference key="NSSuperview" ref="318940040"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="663057875">
-													<int key="NSCellFlags">70385217</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents">Label</string>
-													<reference key="NSSupport" ref="123687714"/>
-													<reference key="NSControlView" ref="999332982"/>
-													<reference key="NSBackgroundColor" ref="949329157"/>
-													<reference key="NSTextColor" ref="503975814"/>
-												</object>
-											</object>
-											<object class="NSTextField" id="900338047">
-												<reference key="NSNextResponder" ref="318940040"/>
-												<int key="NSvFlags">266</int>
-												<string key="NSFrame">{{3, 129}, {341, 17}}</string>
-												<reference key="NSSuperview" ref="318940040"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="181824390">
-													<int key="NSCellFlags">70385217</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents">Label</string>
-													<reference key="NSSupport" ref="123687714"/>
-													<reference key="NSControlView" ref="900338047"/>
-													<reference key="NSBackgroundColor" ref="949329157"/>
-													<reference key="NSTextColor" ref="503975814"/>
-												</object>
-											</object>
-											<object class="NSTextField" id="1038346363">
-												<reference key="NSNextResponder" ref="318940040"/>
-												<int key="NSvFlags">266</int>
-												<string key="NSFrame">{{3, 154}, {341, 17}}</string>
-												<reference key="NSSuperview" ref="318940040"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="624539935">
-													<int key="NSCellFlags">70385217</int>
-													<int key="NSCellFlags2">272630784</int>
-													<string key="NSContents">Label</string>
-													<reference key="NSSupport" ref="123687714"/>
-													<reference key="NSControlView" ref="1038346363"/>
-													<reference key="NSBackgroundColor" ref="949329157"/>
-													<reference key="NSTextColor" ref="503975814"/>
-												</object>
-											</object>
-										</object>
-										<string key="NSFrame">{{100, 0}, {344, 171}}</string>
-										<reference key="NSSuperview" ref="145445589"/>
-										<string key="NSClassName">NSView</string>
-									</object>
-								</object>
-								<string key="NSFrame">{{10, 10}, {444, 171}}</string>
-								<reference key="NSSuperview" ref="652669668"/>
-							</object>
 							<object class="NSView" id="748119605">
 								<reference key="NSNextResponder" ref="652669668"/>
 								<int key="NSvFlags">-2147483382</int>
@@ -1305,6 +1145,134 @@
 								<string key="NSFrame">{{10, 10}, {444, 171}}</string>
 								<reference key="NSSuperview" ref="652669668"/>
 							</object>
+							<object class="NSView" id="145445589">
+								<reference key="NSNextResponder" ref="652669668"/>
+								<int key="NSvFlags">266</int>
+								<object class="NSMutableArray" key="NSSubviews">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<object class="NSCustomView" id="385588554">
+										<reference key="NSNextResponder" ref="145445589"/>
+										<int key="NSvFlags">292</int>
+										<object class="NSMutableArray" key="NSSubviews">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSTextField" id="291143228">
+												<reference key="NSNextResponder" ref="385588554"/>
+												<int key="NSvFlags">267</int>
+												<string key="NSFrame">{{1, 104}, {100, 17}}</string>
+												<reference key="NSSuperview" ref="385588554"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="10774955">
+													<int key="NSCellFlags">68288064</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents">^IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL</string>
+													<reference key="NSSupport" ref="284921973"/>
+													<reference key="NSControlView" ref="291143228"/>
+													<reference key="NSBackgroundColor" ref="949329157"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">1</int>
+														<bytes key="NSRGB">MCAwIDAAA</bytes>
+													</object>
+												</object>
+											</object>
+											<object class="NSTextField" id="999350559">
+												<reference key="NSNextResponder" ref="385588554"/>
+												<int key="NSvFlags">267</int>
+												<string key="NSFrame">{{1, 129}, {100, 17}}</string>
+												<reference key="NSSuperview" ref="385588554"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="815112122">
+													<int key="NSCellFlags">68288064</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents">^IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL</string>
+													<reference key="NSSupport" ref="284921973"/>
+													<reference key="NSControlView" ref="999350559"/>
+													<reference key="NSBackgroundColor" ref="949329157"/>
+													<reference key="NSTextColor" ref="503975814"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="329087810">
+												<reference key="NSNextResponder" ref="385588554"/>
+												<int key="NSvFlags">267</int>
+												<string key="NSFrame">{{1, 154}, {100, 17}}</string>
+												<reference key="NSSuperview" ref="385588554"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="8708799">
+													<int key="NSCellFlags">68288064</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents">^IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL</string>
+													<reference key="NSSupport" ref="284921973"/>
+													<reference key="NSControlView" ref="329087810"/>
+													<reference key="NSBackgroundColor" ref="949329157"/>
+													<reference key="NSTextColor" ref="503975814"/>
+												</object>
+											</object>
+										</object>
+										<string key="NSFrameSize">{100, 171}</string>
+										<reference key="NSSuperview" ref="145445589"/>
+										<string key="NSClassName">GTMWidthBasedTweaker</string>
+									</object>
+									<object class="NSCustomView" id="318940040">
+										<reference key="NSNextResponder" ref="145445589"/>
+										<int key="NSvFlags">292</int>
+										<object class="NSMutableArray" key="NSSubviews">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSTextField" id="1007372376">
+												<reference key="NSNextResponder" ref="318940040"/>
+												<int key="NSvFlags">266</int>
+												<string key="NSFrame">{{4, 104}, {341, 17}}</string>
+												<reference key="NSSuperview" ref="318940040"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="825309367">
+													<int key="NSCellFlags">70385217</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents">Label</string>
+													<reference key="NSSupport" ref="123687714"/>
+													<reference key="NSControlView" ref="1007372376"/>
+													<reference key="NSBackgroundColor" ref="949329157"/>
+													<reference key="NSTextColor" ref="503975814"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="999332982">
+												<reference key="NSNextResponder" ref="318940040"/>
+												<int key="NSvFlags">266</int>
+												<string key="NSFrame">{{4, 129}, {341, 17}}</string>
+												<reference key="NSSuperview" ref="318940040"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="663057875">
+													<int key="NSCellFlags">70385217</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents">Label</string>
+													<reference key="NSSupport" ref="123687714"/>
+													<reference key="NSControlView" ref="999332982"/>
+													<reference key="NSBackgroundColor" ref="949329157"/>
+													<reference key="NSTextColor" ref="503975814"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="900338047">
+												<reference key="NSNextResponder" ref="318940040"/>
+												<int key="NSvFlags">266</int>
+												<string key="NSFrame">{{4, 154}, {341, 17}}</string>
+												<reference key="NSSuperview" ref="318940040"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="181824390">
+													<int key="NSCellFlags">70385217</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents">Label</string>
+													<reference key="NSSupport" ref="123687714"/>
+													<reference key="NSControlView" ref="900338047"/>
+													<reference key="NSBackgroundColor" ref="949329157"/>
+													<reference key="NSTextColor" ref="503975814"/>
+												</object>
+											</object>
+										</object>
+										<string key="NSFrame">{{100, 0}, {344, 171}}</string>
+										<reference key="NSSuperview" ref="145445589"/>
+										<string key="NSClassName">NSView</string>
+									</object>
+								</object>
+								<string key="NSFrame">{{9, 10}, {444, 171}}</string>
+								<reference key="NSSuperview" ref="652669668"/>
+							</object>
 						</object>
 						<string key="NSFrame">{{1, 1}, {462, 189}}</string>
 						<reference key="NSSuperview" ref="86580916"/>
@@ -2799,39 +2767,6 @@
 					</object>
 					<int key="connectionID">804</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: content.details.name</string>
-						<reference key="source" ref="1038346363"/>
-						<reference key="destination" ref="581169699"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1038346363"/>
-							<reference key="NSDestination" ref="581169699"/>
-							<string key="NSLabel">value: content.details.name</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">content.details.name</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-									<string>NSRaisesForNotApplicableKeys</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>^IDS_COOKIES_COOKIE_NONESELECTED</string>
-									<string>^IDS_COOKIES_COOKIE_NONESELECTED</string>
-									<string>^IDS_COOKIES_COOKIE_NONESELECTED</string>
-									<boolean value="NO"/>
-								</object>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">808</int>
-				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -3900,9 +3835,8 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="1007372376"/>
-							<reference ref="1038346363"/>
-							<reference ref="900338047"/>
 							<reference ref="999332982"/>
+							<reference ref="900338047"/>
 						</object>
 						<reference key="parent" ref="145445589"/>
 					</object>
@@ -3914,7 +3848,6 @@
 							<reference ref="291143228"/>
 							<reference ref="999350559"/>
 							<reference ref="329087810"/>
-							<reference ref="435875977"/>
 						</object>
 						<reference key="parent" ref="145445589"/>
 					</object>
@@ -3946,20 +3879,6 @@
 						<reference key="parent" ref="385588554"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">779</int>
-						<reference key="object" ref="435875977"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="911512308"/>
-						</object>
-						<reference key="parent" ref="385588554"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">784</int>
-						<reference key="object" ref="911512308"/>
-						<reference key="parent" ref="435875977"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">796</int>
 						<reference key="object" ref="8708799"/>
 						<reference key="parent" ref="329087810"/>
@@ -3984,11 +3903,11 @@
 						<reference key="parent" ref="318940040"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">775</int>
-						<reference key="object" ref="1038346363"/>
+						<int key="objectID">773</int>
+						<reference key="object" ref="999332982"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="624539935"/>
+							<reference ref="663057875"/>
 						</object>
 						<reference key="parent" ref="318940040"/>
 					</object>
@@ -4002,28 +3921,14 @@
 						<reference key="parent" ref="318940040"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">773</int>
-						<reference key="object" ref="999332982"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="663057875"/>
-						</object>
-						<reference key="parent" ref="318940040"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">778</int>
-						<reference key="object" ref="663057875"/>
-						<reference key="parent" ref="999332982"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">777</int>
 						<reference key="object" ref="181824390"/>
 						<reference key="parent" ref="900338047"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">776</int>
-						<reference key="object" ref="624539935"/>
-						<reference key="parent" ref="1038346363"/>
+						<int key="objectID">778</int>
+						<reference key="object" ref="663057875"/>
+						<reference key="parent" ref="999332982"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">800</int>
@@ -4162,16 +4067,12 @@
 					<string>770.IBPluginDependency</string>
 					<string>773.IBPluginDependency</string>
 					<string>774.IBPluginDependency</string>
-					<string>775.IBPluginDependency</string>
-					<string>776.IBPluginDependency</string>
 					<string>777.IBPluginDependency</string>
 					<string>778.IBPluginDependency</string>
-					<string>779.IBPluginDependency</string>
 					<string>780.IBPluginDependency</string>
 					<string>781.IBPluginDependency</string>
 					<string>782.IBPluginDependency</string>
 					<string>783.IBPluginDependency</string>
-					<string>784.IBPluginDependency</string>
 					<string>795.IBPluginDependency</string>
 					<string>796.IBPluginDependency</string>
 					<string>799.IBPluginDependency</string>
@@ -4182,7 +4083,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{685, 904}, {464, 191}}</string>
+					<string>{{501, 734}, {464, 191}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4315,10 +4216,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>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
diff --git a/chrome/browser/browsing_data_indexed_db_helper.cc b/chrome/browser/browsing_data_indexed_db_helper.cc
index 0ecdc2e..4979471 100644
--- a/chrome/browser/browsing_data_indexed_db_helper.cc
+++ b/chrome/browser/browsing_data_indexed_db_helper.cc
@@ -108,13 +108,9 @@ void BrowsingDataIndexedDBHelperImpl::FetchIndexedDBInfoInWebKitThread() {
   for (FilePath file_path = file_enumerator.Next(); !file_path.empty();
        file_path = file_enumerator.Next()) {
     if (file_path.Extension() == IndexedDBContext::kIndexedDBExtension) {
-      std::string name;
-      WebSecurityOrigin web_security_origin;
-      if (!IndexedDBContext::SplitIndexedDBFileName(
-          file_path, &name, &web_security_origin)) {
-        // Could not parse file name.
-        continue;
-      }
+      WebSecurityOrigin web_security_origin =
+          WebKit::WebSecurityOrigin::createFromDatabaseIdentifier(
+              webkit_glue::FilePathToWebString(file_path.BaseName()));
       if (EqualsASCII(web_security_origin.protocol(),
                       chrome::kExtensionScheme)) {
         // Extension state is not considered browsing data.
@@ -129,7 +125,6 @@ void BrowsingDataIndexedDBHelperImpl::FetchIndexedDBInfoInWebKitThread() {
             web_security_origin.port(),
             web_security_origin.databaseIdentifier().utf8(),
             web_security_origin.toString().utf8(),
-            name,
             file_path,
             file_info.size,
             file_info.last_modified));
@@ -176,7 +171,7 @@ CannedBrowsingDataIndexedDBHelper::CannedBrowsingDataIndexedDBHelper(
 }
 
 void CannedBrowsingDataIndexedDBHelper::AddIndexedDB(
-    const GURL& origin, const string16& name, const string16& description) {
+    const GURL& origin, const string16& description) {
   WebSecurityOrigin web_security_origin =
       WebSecurityOrigin::createFromString(
           UTF8ToUTF16(origin.spec()));
@@ -195,9 +190,8 @@ void CannedBrowsingDataIndexedDBHelper::AddIndexedDB(
       web_security_origin.port(),
       web_security_origin.databaseIdentifier().utf8(),
       security_origin,
-      UTF16ToUTF8(name),
       profile_->GetWebKitContext()->indexed_db_context()->
-          GetIndexedDBFilePath(name, web_security_origin),
+          GetIndexedDBFilePath(web_security_origin.databaseIdentifier()),
       0,
       base::Time()));
 }
diff --git a/chrome/browser/browsing_data_indexed_db_helper.h b/chrome/browser/browsing_data_indexed_db_helper.h
index 11a9755..932c00b 100644
--- a/chrome/browser/browsing_data_indexed_db_helper.h
+++ b/chrome/browser/browsing_data_indexed_db_helper.h
@@ -35,7 +35,6 @@ class BrowsingDataIndexedDBHelper
         unsigned short port,
         const std::string& database_identifier,
         const std::string& origin,
-        const std::string& database_name,
         const FilePath& file_path,
         int64 size,
         base::Time last_modified)
@@ -44,7 +43,6 @@ class BrowsingDataIndexedDBHelper
           port(port),
           database_identifier(database_identifier),
           origin(origin),
-          database_name(database_name),
           file_path(file_path),
           size(size),
           last_modified(last_modified) {
@@ -59,7 +57,6 @@ class BrowsingDataIndexedDBHelper
     unsigned short port;
     std::string database_identifier;
     std::string origin;
-    std::string database_name;
     FilePath file_path;
     int64 size;
     base::Time last_modified;
@@ -97,7 +94,6 @@ class CannedBrowsingDataIndexedDBHelper
   // Add a indexed database to the set of canned indexed databases that is
   // returned by this helper.
   void AddIndexedDB(const GURL& origin,
-                    const string16& name,
                     const string16& description);
 
   // Clear the list of canned indexed databases.
diff --git a/chrome/browser/browsing_data_indexed_db_helper_unittest.cc b/chrome/browser/browsing_data_indexed_db_helper_unittest.cc
index 2817ea4..10df224 100644
--- a/chrome/browser/browsing_data_indexed_db_helper_unittest.cc
+++ b/chrome/browser/browsing_data_indexed_db_helper_unittest.cc
@@ -42,17 +42,16 @@ TEST(CannedBrowsingDataIndexedDBHelperTest, DISABLED_AddIndexedDB) {
 
   const GURL origin1("http://host1:1/");
   const GURL origin2("http://host2:1/");
-  const string16 name(ASCIIToUTF16("name"));
   const string16 description(ASCIIToUTF16("description"));
   const FilePath::CharType file1[] =
-      FILE_PATH_LITERAL("http_host1_1@name.indexeddb");
+      FILE_PATH_LITERAL("http_host1_1.indexeddb");
   const FilePath::CharType file2[] =
-      FILE_PATH_LITERAL("http_host2_1@name.indexeddb");
+      FILE_PATH_LITERAL("http_host2_1.indexeddb");
 
   scoped_refptr<CannedBrowsingDataIndexedDBHelper> helper(
       new CannedBrowsingDataIndexedDBHelper(&profile));
-  helper->AddIndexedDB(origin1, name, description);
-  helper->AddIndexedDB(origin2, name, description);
+  helper->AddIndexedDB(origin1, description);
+  helper->AddIndexedDB(origin2, description);
 
   TestCompletionCallback callback;
   helper->StartFetching(
@@ -72,15 +71,14 @@ TEST(CannedBrowsingDataIndexedDBHelperTest, DISABLED_Unique) {
   TestingProfile profile;
 
   const GURL origin("http://host1:1/");
-  const string16 name(ASCIIToUTF16("name"));
   const string16 description(ASCIIToUTF16("description"));
   const FilePath::CharType file[] =
-      FILE_PATH_LITERAL("http_host1_1@name.indexeddb");
+      FILE_PATH_LITERAL("http_host1_1.indexeddb");
 
   scoped_refptr<CannedBrowsingDataIndexedDBHelper> helper(
       new CannedBrowsingDataIndexedDBHelper(&profile));
-  helper->AddIndexedDB(origin, name, description);
-  helper->AddIndexedDB(origin, name, description);
+  helper->AddIndexedDB(origin, description);
+  helper->AddIndexedDB(origin, description);
 
   TestCompletionCallback callback;
   helper->StartFetching(
@@ -98,14 +96,13 @@ TEST(CannedBrowsingDataIndexedDBHelperTest, Empty) {
   TestingProfile profile;
 
   const GURL origin("http://host1:1/");
-  const string16 name(ASCIIToUTF16("name"));
   const string16 description(ASCIIToUTF16("description"));
 
   scoped_refptr<CannedBrowsingDataIndexedDBHelper> helper(
       new CannedBrowsingDataIndexedDBHelper(&profile));
 
   ASSERT_TRUE(helper->empty());
-  helper->AddIndexedDB(origin, name, description);
+  helper->AddIndexedDB(origin, description);
   ASSERT_FALSE(helper->empty());
   helper->Reset();
   ASSERT_TRUE(helper->empty());
diff --git a/chrome/browser/cocoa/cookie_details.h b/chrome/browser/cocoa/cookie_details.h
index 5298ad8..614c87c 100644
--- a/chrome/browser/cocoa/cookie_details.h
+++ b/chrome/browser/cocoa/cookie_details.h
@@ -83,9 +83,8 @@ enum CocoaCookieDetailsType {
   // kCocoaCookieDetailsTypeTreeAppCache nodes.
   scoped_nsobject<NSString> created_;
 
-  // Only set for types kCocoaCookieDetailsTypeCookie,
-  // kCocoaCookieDetailsTypePromptDatabase, and
-  // kCocoaCookieDetailsTypeTreeIndexedDB nodes.
+  // Only set for types kCocoaCookieDetailsTypeCookie, and
+  // kCocoaCookieDetailsTypePromptDatabase nodes.
   scoped_nsobject<NSString> name_;
 
   // Only set for type kCocoaCookieDetailsTypeTreeLocalStorage,
diff --git a/chrome/browser/cocoa/cookie_details.mm b/chrome/browser/cocoa/cookie_details.mm
index 4c483d1f..b60e0058 100644
--- a/chrome/browser/cocoa/cookie_details.mm
+++ b/chrome/browser/cocoa/cookie_details.mm
@@ -248,7 +248,6 @@
     lastModified_.reset([base::SysWideToNSString(
         base::TimeFormatFriendlyDateAndTime(
             indexedDBInfo->last_modified)) retain]);
-    name_.reset([base::SysUTF8ToNSString(indexedDBInfo->database_name) retain]);
   }
   return self;
 }
diff --git a/chrome/browser/cocoa/cookie_details_unittest.mm b/chrome/browser/cocoa/cookie_details_unittest.mm
index 897d92a..305c0f9 100644
--- a/chrome/browser/cocoa/cookie_details_unittest.mm
+++ b/chrome/browser/cocoa/cookie_details_unittest.mm
@@ -145,7 +145,6 @@ TEST_F(CookiesDetailsTest, CreateForTreeIndexedDB) {
   unsigned short port = 80;
   std::string database_identifier("id");
   std::string origin("moose.org");
-  std::string name("name");
   FilePath file_path(FILE_PATH_LITERAL("/"));
   int64 size = 1234;
   base::Time last_modified = base::Time::Now();
@@ -154,7 +153,6 @@ TEST_F(CookiesDetailsTest, CreateForTreeIndexedDB) {
                                                   port,
                                                   database_identifier,
                                                   origin,
-                                                  name,
                                                   file_path,
                                                   size,
                                                   last_modified);
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc
index 1dd02be..24e3c9a 100644
--- a/chrome/browser/cookies_tree_model.cc
+++ b/chrome/browser/cookies_tree_model.cc
@@ -186,9 +186,10 @@ CookieTreeSessionStorageNode::CookieTreeSessionStorageNode(
 
 CookieTreeIndexedDBNode::CookieTreeIndexedDBNode(
     BrowsingDataIndexedDBHelper::IndexedDBInfo* indexed_db_info)
-    : CookieTreeNode(indexed_db_info->database_name.empty() ?
-          l10n_util::GetStringUTF16(IDS_COOKIES_WEB_DATABASE_UNNAMED_NAME) :
-          UTF8ToUTF16(indexed_db_info->database_name)),
+    : CookieTreeNode(UTF8ToUTF16(
+          indexed_db_info->origin.empty() ?
+              indexed_db_info->database_identifier :
+              indexed_db_info->origin)),
       indexed_db_info_(indexed_db_info) {
 }
 
diff --git a/chrome/browser/dom_ui/options/cookies_view_handler.cc b/chrome/browser/dom_ui/options/cookies_view_handler.cc
index 160a8fa..f1eee91 100644
--- a/chrome/browser/dom_ui/options/cookies_view_handler.cc
+++ b/chrome/browser/dom_ui/options/cookies_view_handler.cc
@@ -157,9 +157,6 @@ void GetCookieTreeNodeDictionary(const CookieTreeNode& node,
       const BrowsingDataIndexedDBHelper::IndexedDBInfo& indexed_db_info =
           *node.GetDetailedInfo().indexed_db_info;
 
-      dict->SetString(kKeyName, indexed_db_info.database_name.empty() ?
-          l10n_util::GetStringUTF8(IDS_COOKIES_WEB_DATABASE_UNNAMED_NAME) :
-          indexed_db_info.database_name);
       dict->SetString(kKeyOrigin, indexed_db_info.origin);
       dict->SetString(kKeySize,
           FormatBytes(indexed_db_info.size,
@@ -234,8 +231,6 @@ void CookiesViewHandler::GetLocalizedValues(
       l10n_util::GetStringUTF16(IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL));
   localized_strings->SetString("label_local_storage_origin",
       l10n_util::GetStringUTF16(IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL));
-  localized_strings->SetString("label_indexed_db_name",
-      l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_NAME_LABEL));
   localized_strings->SetString("label_indexed_db_size",
       l10n_util::GetStringUTF16(IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL));
   localized_strings->SetString("label_indexed_db_last_modified",
diff --git a/chrome/browser/gtk/gtk_chrome_cookie_view.cc b/chrome/browser/gtk/gtk_chrome_cookie_view.cc
index aa4d344..07413f6 100644
--- a/chrome/browser/gtk/gtk_chrome_cookie_view.cc
+++ b/chrome/browser/gtk/gtk_chrome_cookie_view.cc
@@ -181,7 +181,6 @@ void SetAppCacheDetailsSensitivity(GtkChromeCookieView *self,
 
 void SetIndexedDBDetailsSensitivity(GtkChromeCookieView *self,
                                     gboolean enabled) {
-  gtk_widget_set_sensitive(self->indexed_db_name_entry_, enabled);
   gtk_widget_set_sensitive(self->indexed_db_origin_entry_, enabled);
   gtk_widget_set_sensitive(self->indexed_db_size_entry_, enabled);
   gtk_widget_set_sensitive(self->indexed_db_last_modified_entry_, enabled);
@@ -383,9 +382,6 @@ void BuildWidgets(GtkChromeCookieView *self, gboolean editable_expiration) {
                             gtk_util::kLabelSpacing);
 
   row = 0;
-  InitDetailRow(row++, IDS_COOKIES_COOKIE_NAME_LABEL,
-                self->indexed_db_details_table_,
-                &self->indexed_db_name_entry_);
   InitDetailRow(row++, IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL,
                 self->indexed_db_details_table_,
                 &self->indexed_db_origin_entry_);
@@ -602,11 +598,6 @@ void gtk_chrome_cookie_view_display_indexed_db(
     const BrowsingDataIndexedDBHelper::IndexedDBInfo& indexed_db_info) {
   UpdateVisibleDetailedInfo(self, self->indexed_db_details_table_);
 
-  gtk_entry_set_text(GTK_ENTRY(self->indexed_db_name_entry_),
-                     indexed_db_info.database_name.empty() ?
-                         l10n_util::GetStringUTF8(
-                             IDS_COOKIES_WEB_DATABASE_UNNAMED_NAME).c_str() :
-                         indexed_db_info.database_name.c_str());
   gtk_entry_set_text(GTK_ENTRY(self->indexed_db_origin_entry_),
                      indexed_db_info.origin.c_str());
   gtk_entry_set_text(GTK_ENTRY(self->indexed_db_size_entry_),
diff --git a/chrome/browser/gtk/gtk_chrome_cookie_view.h b/chrome/browser/gtk/gtk_chrome_cookie_view.h
index 049d621..93bc96c 100644
--- a/chrome/browser/gtk/gtk_chrome_cookie_view.h
+++ b/chrome/browser/gtk/gtk_chrome_cookie_view.h
@@ -96,7 +96,6 @@ typedef struct {
 
   // The IndexedDB details widgets.
   GtkWidget* indexed_db_details_table_;
-  GtkWidget* indexed_db_name_entry_;
   GtkWidget* indexed_db_origin_entry_;
   GtkWidget* indexed_db_size_entry_;
   GtkWidget* indexed_db_last_modified_entry_;
diff --git a/chrome/browser/gtk/options/cookies_view_unittest.cc b/chrome/browser/gtk/options/cookies_view_unittest.cc
index 76461a1..0c78d7f 100644
--- a/chrome/browser/gtk/options/cookies_view_unittest.cc
+++ b/chrome/browser/gtk/options/cookies_view_unittest.cc
@@ -90,8 +90,6 @@ class CookiesViewTest : public testing::Test {
               GTK_WIDGET_SENSITIVE(display->appcache_last_accessed_entry_));
     // IndexedDB
     EXPECT_EQ(expected_indexed_db,
-              GTK_WIDGET_SENSITIVE(display->indexed_db_name_entry_));
-    EXPECT_EQ(expected_indexed_db,
               GTK_WIDGET_SENSITIVE(display->indexed_db_origin_entry_));
     EXPECT_EQ(expected_indexed_db,
               GTK_WIDGET_SENSITIVE(display->indexed_db_size_entry_));
diff --git a/chrome/browser/in_process_webkit/indexed_db_browsertest.cc b/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
index 0bd63d0..9804be7 100644
--- a/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
+++ b/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
@@ -7,47 +7,10 @@
 #include "base/ref_counted.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
-#include "chrome/browser/in_process_webkit/indexed_db_context.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/in_process_browser_test.h"
-#include "chrome/test/thread_test_helper.h"
 #include "chrome/test/ui_test_utils.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
-
-namespace {
-
-const FilePath kTestIndexedDBFile(
-    FILE_PATH_LITERAL("http_host_1@database%20name.indexeddb"));
-
-class TestOnWebKitThread : public ThreadTestHelper {
- public:
-  TestOnWebKitThread()
-      : ThreadTestHelper(BrowserThread::WEBKIT) {
-  }
-
-  const std::string& database_name() const { return database_name_; }
-  const WebKit::WebSecurityOrigin& security_origin() const {
-      return security_origin_;
-  }
-
- private:
-  virtual ~TestOnWebKitThread() {}
-
-  virtual void RunTest() {
-    set_test_result(IndexedDBContext::SplitIndexedDBFileName(
-        kTestIndexedDBFile, &database_name_, &security_origin_));
-  }
-
-  std::string database_name_;
-  WebKit::WebSecurityOrigin security_origin_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestOnWebKitThread);
-};
-
-}  // namespace
 
 // This browser test is aimed towards exercising the IndexedDB bindings and
 // the actual implementation that lives in the browser side (in_process_webkit).
@@ -78,17 +41,6 @@ class IndexedDBBrowserTest : public InProcessBrowserTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, SplitFilename) {
-  scoped_refptr<TestOnWebKitThread> test_on_webkit_thread(
-      new TestOnWebKitThread);
-  ASSERT_TRUE(test_on_webkit_thread->Run());
-
-  EXPECT_EQ("database name", test_on_webkit_thread->database_name());
-  std::string origin_str =
-      test_on_webkit_thread->security_origin().toString().utf8();
-  EXPECT_EQ("http://host:1", origin_str);
-}
-
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) {
   SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html"))));
 }
diff --git a/chrome/browser/in_process_webkit/indexed_db_context.cc b/chrome/browser/in_process_webkit/indexed_db_context.cc
index b057861..50dcd35 100644
--- a/chrome/browser/in_process_webkit/indexed_db_context.cc
+++ b/chrome/browser/in_process_webkit/indexed_db_context.cc
@@ -7,17 +7,14 @@
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
-#include "googleurl/src/url_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBDatabase.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebIDBDatabase;
 using WebKit::WebIDBFactory;
-using WebKit::WebSecurityOrigin;
 
 const FilePath::CharType IndexedDBContext::kIndexedDBDirectory[] =
     FILE_PATH_LITERAL("IndexedDB");
@@ -40,39 +37,9 @@ WebIDBFactory* IndexedDBContext::GetIDBFactory() {
 }
 
 FilePath IndexedDBContext::GetIndexedDBFilePath(
-    const string16& database_name,
-    const WebSecurityOrigin& origin) const {
+    const string16& origin_id) const {
   FilePath storage_dir = webkit_context_->data_path().Append(
       kIndexedDBDirectory);
-  FilePath::StringType id = webkit_glue::WebStringToFilePathString(
-      WebIDBFactory::databaseFileName(database_name, origin));
-  return storage_dir.Append(id);
-}
-
-// static
-bool IndexedDBContext::SplitIndexedDBFileName(
-    const FilePath& file_name,
-    std::string* database_name,
-    WebSecurityOrigin* security_origin) {
-  FilePath::StringType base_name =
-      file_name.BaseName().RemoveExtension().value();
-  size_t db_name_separator = base_name.find(FILE_PATH_LITERAL("@"));
-  if (db_name_separator == FilePath::StringType::npos ||
-      db_name_separator == 0) {
-    return false;
-  }
-
-  *security_origin =
-      WebSecurityOrigin::createFromDatabaseIdentifier(
-          webkit_glue::FilePathStringToWebString(
-              base_name.substr(0, db_name_separator)));
-#if defined(OS_POSIX)
-  std::string name = base_name.substr(db_name_separator + 1);
-#elif defined(OS_WIN)
-  std::string name = WideToUTF8(base_name.substr(db_name_separator + 1));
-#endif
-  url_canon::RawCanonOutputT<char16> output;
-  url_util::DecodeURLEscapeSequences(name.c_str(), name.length(), &output);
-  *database_name = UTF16ToUTF8(string16(output.data(), output.length()));
-  return true;
+  FilePath::StringType id = webkit_glue::WebStringToFilePathString(origin_id);
+  return storage_dir.Append(id.append(kIndexedDBExtension));
 }
diff --git a/chrome/browser/in_process_webkit/indexed_db_context.h b/chrome/browser/in_process_webkit/indexed_db_context.h
index a8519fb..6112d94 100644
--- a/chrome/browser/in_process_webkit/indexed_db_context.h
+++ b/chrome/browser/in_process_webkit/indexed_db_context.h
@@ -15,7 +15,6 @@ class WebKitContext;
 
 namespace WebKit {
 class WebIDBFactory;
-class WebSecurityOrigin;
 }
 
 class IndexedDBContext {
@@ -31,17 +30,8 @@ class IndexedDBContext {
   // The indexed db file extension.
   static const FilePath::CharType kIndexedDBExtension[];
 
-  // Get the file name of the indexed db file for the given origin and database
-  // name.
-  FilePath GetIndexedDBFilePath(const string16& database_name,
-                                const WebKit::WebSecurityOrigin& origin) const;
-
-  // Splits an indexed database file name into a security origin and a
-  // database name.
-  static bool SplitIndexedDBFileName(
-      const FilePath& file_name,
-      std::string* database_name,
-      WebKit::WebSecurityOrigin* security_origin);
+  // Get the file name of the indexed db file for the given origin.
+  FilePath GetIndexedDBFilePath(const string16& origin_id) const;
 
  private:
   scoped_ptr<WebKit::WebIDBFactory> idb_factory_;
diff --git a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc
index 1735d7e..c0034eb 100644
--- a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -275,8 +275,7 @@ void IndexedDBDispatcherHost::OnIDBFactoryOpen(
   CallRenderViewHostContentSettingsDelegate(
       process_id_, params.routing_id_,
       &RenderViewHostDelegate::ContentSettings::OnIndexedDBAccessed,
-      host, params.name_, params.description_,
-      content_setting == CONTENT_SETTING_BLOCK);
+      host, params.description_, content_setting == CONTENT_SETTING_BLOCK);
 
   if (content_setting == CONTENT_SETTING_BLOCK) {
     // TODO(jorlow): Change this to the proper error code once we figure out
diff --git a/chrome/browser/mock_browsing_data_indexed_db_helper.cc b/chrome/browser/mock_browsing_data_indexed_db_helper.cc
index ed83fd3..06e4039 100644
--- a/chrome/browser/mock_browsing_data_indexed_db_helper.cc
+++ b/chrome/browser/mock_browsing_data_indexed_db_helper.cc
@@ -34,12 +34,12 @@ void MockBrowsingDataIndexedDBHelper::DeleteIndexedDBFile(
 void MockBrowsingDataIndexedDBHelper::AddIndexedDBSamples() {
   response_.push_back(
       BrowsingDataIndexedDBHelper::IndexedDBInfo(
-          "http", "idbhost1", 1, "idb1", "http://idbhost1:1/", "name",
+          "http", "idbhost1", 1, "idb1", "http://idbhost1:1/",
           FilePath(FILE_PATH_LITERAL("file1")), 1, base::Time()));
   files_[FILE_PATH_LITERAL("file1")] = true;
   response_.push_back(
       BrowsingDataIndexedDBHelper::IndexedDBInfo(
-          "http", "idbhost2", 2, "idb2", "http://idbhost2:2/", "name",
+          "http", "idbhost2", 2, "idb2", "http://idbhost2:2/",
           FilePath(FILE_PATH_LITERAL("file2")), 2, base::Time()));
   files_[FILE_PATH_LITERAL("file2")] = true;
 }
diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h
index 0602f2b..a4e88a3 100644
--- a/chrome/browser/renderer_host/render_view_host_delegate.h
+++ b/chrome/browser/renderer_host/render_view_host_delegate.h
@@ -397,7 +397,6 @@ class RenderViewHostDelegate {
     // |blocked_by_policy| should be true, and this function should invoke
     // OnContentBlocked.
     virtual void OnIndexedDBAccessed(const GURL& url,
-                                     const string16& name,
                                      const string16& description,
                                      bool blocked_by_policy) = 0;
 
diff --git a/chrome/browser/resources/options/cookies_view.html b/chrome/browser/resources/options/cookies_view.html
index 83ff149..7092290 100644
--- a/chrome/browser/resources/options/cookies_view.html
+++ b/chrome/browser/resources/options/cookies_view.html
@@ -147,12 +147,6 @@
         <table>
           <tr>
             <td class="cookie-details-label"
-                i18n-content="label_indexed_db_name">
-            </td>
-            <td><span id="indexedDBName"></span></td>
-          </tr>
-          <tr>
-            <td class="cookie-details-label"
                 i18n-content="label_indexed_db_origin">
             </td>
             <td><span id="indexedDBOrigin"></span></td>
diff --git a/chrome/browser/resources/options/cookies_view.js b/chrome/browser/resources/options/cookies_view.js
index 072e89a..e59f5bb 100644
--- a/chrome/browser/resources/options/cookies_view.js
+++ b/chrome/browser/resources/options/cookies_view.js
@@ -148,7 +148,6 @@ cr.define('options', function() {
      * Sets IndexedDB info to display.
      */
     setIndexedDBInfo: function(indexedDB) {
-      $('indexedDBName').textContent = indexedDB.name;
       $('indexedDBOrigin').textContent = indexedDB.origin;
       $('indexedDBSize').textContent = indexedDB.size;
       $('indexedDBLastModified').textContent = indexedDB.modified;
diff --git a/chrome/browser/tab_contents/tab_specific_content_settings.cc b/chrome/browser/tab_contents/tab_specific_content_settings.cc
index f0989a3c..edafe6cd 100644
--- a/chrome/browser/tab_contents/tab_specific_content_settings.cc
+++ b/chrome/browser/tab_contents/tab_specific_content_settings.cc
@@ -110,16 +110,15 @@ void TabSpecificContentSettings::OnCookieAccessed(
 
 void TabSpecificContentSettings::OnIndexedDBAccessed(
     const GURL& url,
-    const string16& name,
     const string16& description,
     bool blocked_by_policy) {
   if (blocked_by_policy) {
     blocked_local_shared_objects_.indexed_dbs()->AddIndexedDB(
-        url, name, description);
+        url, description);
     OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES, std::string());
   }else {
     allowed_local_shared_objects_.indexed_dbs()->AddIndexedDB(
-        url, name, description);
+        url, description);
     OnContentAccessed(CONTENT_SETTINGS_TYPE_COOKIES);
   }
 }
diff --git a/chrome/browser/tab_contents/tab_specific_content_settings.h b/chrome/browser/tab_contents/tab_specific_content_settings.h
index 7f0aac79..5cc9213 100644
--- a/chrome/browser/tab_contents/tab_specific_content_settings.h
+++ b/chrome/browser/tab_contents/tab_specific_content_settings.h
@@ -95,7 +95,6 @@ class TabSpecificContentSettings
                                 const std::string& cookie_line,
                                 bool blocked_by_policy);
   virtual void OnIndexedDBAccessed(const GURL& url,
-                                   const string16& name,
                                    const string16& description,
                                    bool blocked_by_policy);
   virtual void OnLocalStorageAccessed(const GURL& url,
diff --git a/chrome/browser/views/indexed_db_info_view.cc b/chrome/browser/views/indexed_db_info_view.cc
index 1b0b28c..733ef6e 100644
--- a/chrome/browser/views/indexed_db_info_view.cc
+++ b/chrome/browser/views/indexed_db_info_view.cc
@@ -23,8 +23,7 @@ static const int kIndexedDBInfoViewInsetSize = 3;
 // IndexedDBInfoView, public:
 
 IndexedDBInfoView::IndexedDBInfoView()
-    : name_value_field_(NULL),
-      origin_value_field_(NULL),
+    : origin_value_field_(NULL),
       size_value_field_(NULL),
       last_modified_value_field_(NULL) {
 }
@@ -34,10 +33,6 @@ IndexedDBInfoView::~IndexedDBInfoView() {
 
 void IndexedDBInfoView::SetIndexedDBInfo(
     const BrowsingDataIndexedDBHelper::IndexedDBInfo& indexed_db_info) {
-  name_value_field_->SetText(
-      indexed_db_info.database_name.empty() ?
-          l10n_util::GetString(IDS_COOKIES_WEB_DATABASE_UNNAMED_NAME) :
-          UTF8ToWide(indexed_db_info.database_name));
   origin_value_field_->SetText(UTF8ToWide(indexed_db_info.origin));
   size_value_field_->SetText(
       FormatBytes(indexed_db_info.size,
@@ -49,7 +44,6 @@ void IndexedDBInfoView::SetIndexedDBInfo(
 }
 
 void IndexedDBInfoView::EnableIndexedDBDisplay(bool enabled) {
-  name_value_field_->SetEnabled(enabled);
   origin_value_field_->SetEnabled(enabled);
   size_value_field_->SetEnabled(enabled);
   last_modified_value_field_->SetEnabled(enabled);
@@ -58,7 +52,6 @@ void IndexedDBInfoView::EnableIndexedDBDisplay(bool enabled) {
 void IndexedDBInfoView::ClearIndexedDBDisplay() {
   std::wstring no_cookie_string =
       l10n_util::GetString(IDS_COOKIES_COOKIE_NONESELECTED);
-  name_value_field_->SetText(no_cookie_string);
   origin_value_field_->SetText(no_cookie_string);
   size_value_field_->SetText(no_cookie_string);
   last_modified_value_field_->SetText(no_cookie_string);
@@ -84,9 +77,6 @@ void IndexedDBInfoView::Init() {
       kIndexedDBInfoViewBorderSize, border_color);
   set_border(border);
 
-  views::Label* name_label = new views::Label(
-      l10n_util::GetString(IDS_COOKIES_COOKIE_NAME_LABEL));
-  name_value_field_ = new views::Textfield;
   views::Label* origin_label = new views::Label(
       l10n_util::GetString(IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL));
   origin_value_field_ = new views::Textfield;
@@ -115,10 +105,6 @@ void IndexedDBInfoView::Init() {
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, three_column_layout_id);
-  layout->AddView(name_label);
-  layout->AddView(name_value_field_);
-  layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
-  layout->StartRow(0, three_column_layout_id);
   layout->AddView(origin_label);
   layout->AddView(origin_value_field_);
   layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
@@ -133,9 +119,6 @@ void IndexedDBInfoView::Init() {
   // Color these borderless text areas the same as the containing dialog.
   SkColor text_area_background = color_utils::GetSysSkColor(COLOR_3DFACE);
   // Now that the Textfields are in the view hierarchy, we can initialize them.
-  name_value_field_->SetReadOnly(true);
-  name_value_field_->RemoveBorder();
-  name_value_field_->SetBackgroundColor(text_area_background);
   origin_value_field_->SetReadOnly(true);
   origin_value_field_->RemoveBorder();
   origin_value_field_->SetBackgroundColor(text_area_background);
diff --git a/chrome/browser/views/indexed_db_info_view.h b/chrome/browser/views/indexed_db_info_view.h
index 20ba89b..4be00a5 100644
--- a/chrome/browser/views/indexed_db_info_view.h
+++ b/chrome/browser/views/indexed_db_info_view.h
@@ -45,7 +45,6 @@ class IndexedDBInfoView : public views::View {
   void Init();
 
   // Individual property labels
-  views::Textfield* name_value_field_;
   views::Textfield* origin_value_field_;
   views::Textfield* size_value_field_;
   views::Textfield* last_modified_value_field_;