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

chrome/browser/browsing_data_indexed_db_helper.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_indexed_db_helper.h"
 
 #include "base/bind.h"
 #include "base/callback.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 "content/public/browser/indexed_db_context.h"
 #include "webkit/database/database_util.h"
 #include "webkit/glue/webkit_glue.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::IndexedDBContext;
 using webkit_database::DatabaseUtil;
@@ skipping 76 matching lines @@
           &BrowsingDataIndexedDBHelperImpl::DeleteIndexedDBInWebKitThread, this,
           origin));
 }
 
 void BrowsingDataIndexedDBHelperImpl::FetchIndexedDBInfoInWebKitThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
   std::vector<GURL> origins = indexed_db_context_->GetAllOrigins();
   for (std::vector<GURL>::const_iterator iter = origins.begin();
        iter != origins.end(); ++iter) {
     const GURL& origin = *iter;
-    if (origin.SchemeIs(chrome::kExtensionScheme))
-      continue;  // Extension state is not considered browsing data.
+    if (!BrowsingDataHelper::HasValidScheme(origin))
+      continue;  // Non-websafe state is not considered browsing data.
+
     indexed_db_info_.push_back(IndexedDBInfo(
         origin,
         indexed_db_context_->GetOriginDiskUsage(origin),
         indexed_db_context_->GetOriginLastModified(origin)));
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowsingDataIndexedDBHelperImpl::NotifyInUIThread, this));
 }
@@ skipping 60 matching lines @@
       new CannedBrowsingDataIndexedDBHelper();
 
   base::AutoLock auto_lock(lock_);
   clone->pending_indexed_db_info_ = pending_indexed_db_info_;
   clone->indexed_db_info_ = indexed_db_info_;
   return clone;
 }
 
 void CannedBrowsingDataIndexedDBHelper::AddIndexedDB(
     const GURL& origin, const string16& description) {
+  if (!BrowsingDataHelper::HasValidScheme(origin))
+    return;  // Non-websafe state is not considered browsing data.
+
   base::AutoLock auto_lock(lock_);
   pending_indexed_db_info_.push_back(PendingIndexedDBInfo(origin, description));
 }
 
 void CannedBrowsingDataIndexedDBHelper::Reset() {
   base::AutoLock auto_lock(lock_);
   indexed_db_info_.clear();
   pending_indexed_db_info_.clear();
 }
 
@@ skipping 58 matching lines @@
     completion_callback_.Run(indexed_db_info_);
     completion_callback_.Reset();
   }
   is_fetching_ = false;
 }
 
 void CannedBrowsingDataIndexedDBHelper::CancelNotification() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   completion_callback_.Reset();
 }