Fix shadowed variables in the content layer.

Shadowed variables can make code harder to read. Don't support them
in the content layer.

BUG=794619

This CL was uploaded by git cl split.

R=dmurph@chromium.org

Change-Id: Ie36fb07ec35d59a1bfbeb21773fe68b04ac14bf1
Reviewed-on: https://chromium-review.googlesource.com/923352Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537390}

content/browser/dom_storage/local_storage_context_mojo.cc

@@ -939,13 +939,14 @@ void LocalStorageContextMojo::OnGotMetaData(
       continue;
     }
 
-    LocalStorageOriginMetaData data;
-    if (!data.ParseFromArray(row->value.data(), row->value.size())) {
+    LocalStorageOriginMetaData row_data;
+    if (!row_data.ParseFromArray(row->value.data(), row->value.size())) {
       // TODO(mek): Deal with database corruption.
       continue;
     }
-    info.data_size = data.size_bytes();
-    info.last_modified = base::Time::FromInternalValue(data.last_modified());
+    info.data_size = row_data.size_bytes();
+    info.last_modified =
+        base::Time::FromInternalValue(row_data.last_modified());
     result.push_back(std::move(info));
   }
   // Add any origins for which LevelDBWrappers exist, but which haven't