Limiting the "Cookies and site data" form to "web safe" schemes.

chrome/browser/browsing_data_file_system_helper.cc

 // Copyright (c) 2012 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/browsing_data_file_system_helper.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/browsing_data_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 
@@ skipping 93 matching lines @@
       origin_enumerator(BrowserContext::GetFileSystemContext(profile_)->
           sandbox_provider()->CreateOriginEnumerator());
 
   // We don't own this pointer; it's a magic singleton generated by the
   // profile's FileSystemContext. Deleting it would be a bad idea.
   fileapi::FileSystemQuotaUtil* quota_util =
       BrowserContext::GetFileSystemContext(profile_)->GetQuotaUtil(
           fileapi::kFileSystemTypeTemporary);
 
   GURL current;
+
   while (!(current = origin_enumerator->Next()).is_empty()) {
-    if (current.SchemeIs(chrome::kExtensionScheme)) {
-      // Extension state is not considered browsing data.
-      continue;
-    }
+    if (!BrowsingDataHelper::HasValidScheme(current))
+      continue; // Non-websafe state is not considered browsing data.
+
     // We can call these synchronous methods as we've already verified that
     // we're running on the FILE thread.
     int64 persistent_usage = quota_util->GetOriginUsageOnFileThread(current,
         fileapi::kFileSystemTypePersistent);
     int64 temporary_usage = quota_util->GetOriginUsageOnFileThread(current,
         fileapi::kFileSystemTypeTemporary);
     file_system_info_.push_back(
         FileSystemInfo(
             current,
             origin_enumerator->HasFileSystemType(
@@ skipping 93 matching lines @@
         file_system->has_temporary = true;
         file_system->usage_temporary = size;
       }
       duplicate_origin = true;
       break;
     }
   }
   if (duplicate_origin)
     return;
 
+  if (!BrowsingDataHelper::HasValidScheme(origin))
+    return; // Non-websafe state is not considered browsing data.
+
   file_system_info_.push_back(FileSystemInfo(
       origin,
       (type == fileapi::kFileSystemTypePersistent),
       (type == fileapi::kFileSystemTypeTemporary),
       (type == fileapi::kFileSystemTypePersistent) ? size : 0,
       (type == fileapi::kFileSystemTypeTemporary) ? size : 0));
 }
 
 void CannedBrowsingDataFileSystemHelper::Reset() {
   file_system_info_.clear();
@@ skipping 23 matching lines @@
     completion_callback_.Run(file_system_info_);
     completion_callback_.Reset();
   }
   is_fetching_ = false;
 }
 
 void CannedBrowsingDataFileSystemHelper::CancelNotification() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   completion_callback_.Reset();
 }