WebSQL: Remove OriginInfo::DBInfo::description.

The member is kept up to date in code, but only read in tests.

Change-Id: I2a1fb25e9ac51e2e26d2b38365df55b502d3c7af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2634861
Auto-Submit: Victor Costan <pwnall@chromium.org>
Reviewed-by: Joshua Bell <jsbell@chromium.org>
Commit-Queue: Joshua Bell <jsbell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844854}

storage/browser/database/database_tracker.cc

@@ -66,14 +66,6 @@ int64_t OriginInfo::GetDatabaseSize(const base::string16& database_name) const {
   return 0;
 }
 
-base::string16 OriginInfo::GetDatabaseDescription(
-    const base::string16& database_name) const {
-  auto it = database_info_.find(database_name);
-  if (it != database_info_.end())
-    return it->second.description;
-  return base::string16();
-}
-
 base::Time OriginInfo::GetDatabaseLastModified(
     const base::string16& database_name) const {
   auto it = database_info_.find(database_name);
@@ -595,7 +587,6 @@ DatabaseTracker::CachedOriginInfo* DatabaseTracker::MaybeGetCachedOriginInfo(
         db_file_size = GetDBFileSize(origin_identifier, db.database_name);
       }
       origin_info.SetDatabaseSize(db.database_name, db_file_size);
-      origin_info.SetDatabaseDescription(db.database_name, db.description);
 
       base::FilePath path =
           GetFullDBFilePath(origin_identifier, db.database_name);
@@ -634,7 +625,6 @@ int64_t DatabaseTracker::SeedOpenDatabaseInfo(
   CachedOriginInfo* info = MaybeGetCachedOriginInfo(origin_id, false);
   if (info) {
     info->SetDatabaseSize(name, size);
-    info->SetDatabaseDescription(name, description);
   }
   return size;
 }
@@ -648,8 +638,6 @@ int64_t DatabaseTracker::UpdateOpenDatabaseInfoAndNotify(
   int64_t new_size = GetDBFileSize(origin_id, name);
   int64_t old_size = database_connections_.GetOpenDatabaseSize(origin_id, name);
   CachedOriginInfo* info = MaybeGetCachedOriginInfo(origin_id, false);
-  if (info && opt_description)
-    info->SetDatabaseDescription(name, *opt_description);
   if (old_size != new_size) {
     database_connections_.SetOpenDatabaseSize(origin_id, name, new_size);
     if (info)

storage/browser/database/database_tracker.h

@@ -57,13 +57,10 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) OriginInfo {
   base::Time LastModified() const { return last_modified_; }
   void GetAllDatabaseNames(std::vector<base::string16>* databases) const;
   int64_t GetDatabaseSize(const base::string16& database_name) const;
-  base::string16 GetDatabaseDescription(
-      const base::string16& database_name) const;
   base::Time GetDatabaseLastModified(const base::string16& database_name) const;
 
  protected:
   struct DBInfo {
-    base::string16 description;
     int64_t size;
     base::Time last_modified;
   };
@@ -202,10 +199,6 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) DatabaseTracker
       if (new_size != old_size)
         total_size_ += new_size - old_size;
     }
-    void SetDatabaseDescription(const base::string16& database_name,
-                                const base::string16& description) {
-      database_info_[database_name].description = description;
-    }
     void SetDatabaseLastModified(const base::string16& database_name,
                                  const base::Time& last_modified) {
       database_info_[database_name].last_modified = last_modified;

storage/browser/database/database_tracker_unittest.cc

@@ -807,7 +807,6 @@ class DatabaseTracker_TestHelper_Test {
           tracker->DatabaseModified(kOriginId, kEmptyName);
           EXPECT_TRUE(tracker->GetAllOriginsInfo(&infos));
           EXPECT_EQ(1u, infos.size());
-          EXPECT_EQ(kDescription, infos[0].GetDatabaseDescription(kEmptyName));
           EXPECT_FALSE(
               tracker->GetFullDBFilePath(kOriginId, kEmptyName).empty());
           tracker->DatabaseOpened(kOriginId, kEmptyName, kChangedDescription, 0,
@@ -815,8 +814,6 @@ class DatabaseTracker_TestHelper_Test {
           infos.clear();
           EXPECT_TRUE(tracker->GetAllOriginsInfo(&infos));
           EXPECT_EQ(1u, infos.size());
-          EXPECT_EQ(kChangedDescription,
-                    infos[0].GetDatabaseDescription(kEmptyName));
           tracker->DatabaseClosed(kOriginId, kEmptyName);
           tracker->DatabaseClosed(kOriginId, kEmptyName);