Site Settings Desktop: Fix crash when deleting storage for a site.

chrome/browser/ui/webui/settings/site_settings_handler.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/settings/site_settings_handler.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 302 matching lines @@
       = new StorageInfoFetcher(profile_);
   storage_info_fetcher->FetchStorageInfo(
       base::Bind(&SiteSettingsHandler::OnGetUsageInfo, base::Unretained(this)));
 }
 
 void SiteSettingsHandler::HandleClearUsage(
     const base::ListValue* args) {
   CHECK_EQ(2U, args->GetSize());
   std::string origin;
   CHECK(args->GetString(0, &origin));
-  std::string type;
-  CHECK(args->GetString(1, &type));
+  double storage_type;
+  CHECK(args->GetDouble(1, &storage_type));

[Finnur, 2016/09/20 11:37:27]

This was the source of the crash. When I checked the code in 
initially, I was reading a double here but in a subsequent CL
(that converted the content settings enum to string) I accidentally 
changed this to GetString (mistakenly thinking this was a 
content settings type). But this is a storage type -- as should be 
obvious now.

[dschuyler, 2016/09/20 18:28:51]

Would it be ok to GetInteger here instead of GetDouble?

[Dan Beam, 2016/09/20 19:01:59]

I don't think that will work

 
   GURL url(origin);
   if (url.is_valid()) {
     clearing_origin_ = origin;
 
     // Start by clearing the storage data asynchronously.
     scoped_refptr<StorageInfoFetcher> storage_info_fetcher
         = new StorageInfoFetcher(profile_);
     storage_info_fetcher->ClearStorage(
         url.host(),
-        static_cast<storage::StorageType>(static_cast<int>(
-            site_settings::ContentSettingsTypeFromGroupName(type))),
+        static_cast<storage::StorageType>(static_cast<int>(storage_type)),
         base::Bind(&SiteSettingsHandler::OnUsageInfoCleared,
             base::Unretained(this)));
 
     // Also clear the *local* storage data.
     scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper =
         new BrowsingDataLocalStorageHelper(profile_);
     local_storage_helper->DeleteOrigin(url);
   }
 }
 
@@ skipping 362 matching lines @@
     origin = content::kUnreachableWebDataURL;
   }
 
   content::HostZoomMap* host_zoom_map;
   host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_);
   double default_level = host_zoom_map->GetDefaultZoomLevel();
   host_zoom_map->SetZoomLevelForHost(origin, default_level);
 }
 
 }  // namespace settings