More WebSQLDatabase and QuotaManager integration.

chrome/browser/extensions/extension_service_unittest.cc

 // Copyright (c) 2011 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/extensions/extension_service_unittest.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 2680 matching lines @@
   net::CookieOptions options;
   cookie_monster->SetCookieWithOptions(ext_url, "dummy=value", options);
   net::CookieList list = cookie_monster->GetAllCookiesForURL(ext_url);
   EXPECT_EQ(1U, list.size());
 
   // Open a database.
   webkit_database::DatabaseTracker* db_tracker = profile_->GetDatabaseTracker();
   string16 db_name = UTF8ToUTF16("db");
   string16 description = UTF8ToUTF16("db_description");
   int64 size;
-  int64 available;
-  db_tracker->DatabaseOpened(origin_id, db_name, description, 1, &size,
-                             &available);
+  db_tracker->DatabaseOpened(origin_id, db_name, description, 1, &size);
   db_tracker->DatabaseClosed(origin_id, db_name);
   std::vector<webkit_database::OriginInfo> origins;
   db_tracker->GetAllOriginsInfo(&origins);
   EXPECT_EQ(1U, origins.size());
   EXPECT_EQ(origin_id, origins[0].GetOrigin());
 
   // Create local storage. We only simulate this by creating the backing file
   // since webkit is not initialized.
   DOMStorageContext* context =
       profile_->GetWebKitContext()->dom_storage_context();
@@ skipping 630 matching lines @@
       extensions_path.AppendASCII("unlimited_quota")
       .AppendASCII("2.0");
   service_->LoadExtension(limited_quota_ext);
   service_->LoadExtension(unlimited_quota_ext);
   service_->LoadExtension(unlimited_quota_ext2);
   loop_.RunAllPending();
 
   ASSERT_EQ(3u, loaded_.size());
   EXPECT_TRUE(profile_.get());
   EXPECT_FALSE(profile_->IsOffTheRecord());
-
-  // Open the database from each origin to make the tracker aware
-  // of the existence of these origins and to get their quotas.
-  int64 limited_quota = -1;
-  int64 unlimited_quota = -1;
-  string16 limited_quota_identifier =
-      webkit_database::DatabaseUtil::GetOriginIdentifier(loaded_[0]->url());
-  string16 unlimited_quota_identifier =
-      webkit_database::DatabaseUtil::GetOriginIdentifier(loaded_[1]->url());
-  string16 unlimited_quota_identifier2 =
-      webkit_database::DatabaseUtil::GetOriginIdentifier(loaded_[2]->url());
-  string16 db_name = UTF8ToUTF16("db");
-  string16 description = UTF8ToUTF16("db_description");
-  int64 database_size;
-  webkit_database::DatabaseTracker* db_tracker = profile_->GetDatabaseTracker();
-
-  // First check the normal limited quota extension.
-  db_tracker->DatabaseOpened(limited_quota_identifier, db_name, description,
-                             1, &database_size, &limited_quota);
-  db_tracker->DatabaseClosed(limited_quota_identifier, db_name);
-  EXPECT_EQ(profile_->GetDatabaseTracker()->GetDefaultQuota(), limited_quota);
-
-  // Now check the two unlimited quota ones.
-  db_tracker->DatabaseOpened(unlimited_quota_identifier, db_name, description,
-                             1, &database_size, &unlimited_quota);
-  db_tracker->DatabaseClosed(unlimited_quota_identifier, db_name);
-  EXPECT_EQ(kint64max, unlimited_quota);
-  db_tracker->DatabaseOpened(unlimited_quota_identifier2, db_name, description,
-                             1, &database_size, &unlimited_quota);
-  db_tracker->DatabaseClosed(unlimited_quota_identifier2, db_name);
-
-  EXPECT_EQ(kint64max, unlimited_quota);
+  EXPECT_FALSE(profile_->GetExtensionSpecialStoragePolicy()->IsStorageUnlimited(
+      loaded_[0]->url()));
+  EXPECT_TRUE(profile_->GetExtensionSpecialStoragePolicy()->IsStorageUnlimited(
+      loaded_[1]->url()));
+  EXPECT_TRUE(profile_->GetExtensionSpecialStoragePolicy()->IsStorageUnlimited(
+      loaded_[2]->url()));
 }
 
 // Tests ExtensionService::register_component_extension().
 TEST_F(ExtensionServiceTest, ComponentExtensions) {
   InitializeEmptyExtensionService();
 
   // Component extensions should work even when extensions are disabled.
   set_extensions_enabled(false);
 
   FilePath path = data_dir_
@@ skipping 432 matching lines @@
   ASSERT_FALSE(AddPendingSyncInstall());
 
   // Wait for the external source to install.
   WaitForCrxInstall(crx_path_, true);
   ASSERT_TRUE(IsCrxInstalled());
 
   // Now that the extension is installed, sync request should fail
   // because the extension is already installed.
   ASSERT_FALSE(AddPendingSyncInstall());
 }