OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/extensions/extension_service_unittest.h" | 5 #include "chrome/browser/extensions/extension_service_unittest.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 #include "chrome/common/extensions/url_pattern.h" | 67 #include "chrome/common/extensions/url_pattern.h" |
68 #include "chrome/common/pref_names.h" | 68 #include "chrome/common/pref_names.h" |
69 #include "chrome/common/string_ordinal.h" | 69 #include "chrome/common/string_ordinal.h" |
70 #include "chrome/common/url_constants.h" | 70 #include "chrome/common/url_constants.h" |
71 #include "chrome/test/base/testing_profile.h" | 71 #include "chrome/test/base/testing_profile.h" |
72 #include "content/public/browser/dom_storage_context.h" | 72 #include "content/public/browser/dom_storage_context.h" |
73 #include "content/public/browser/indexed_db_context.h" | 73 #include "content/public/browser/indexed_db_context.h" |
74 #include "content/public/browser/notification_registrar.h" | 74 #include "content/public/browser/notification_registrar.h" |
75 #include "content/public/browser/notification_service.h" | 75 #include "content/public/browser/notification_service.h" |
76 #include "content/public/browser/plugin_service.h" | 76 #include "content/public/browser/plugin_service.h" |
| 77 #include "content/public/browser/storage_partition.h" |
77 #include "content/public/common/content_constants.h" | 78 #include "content/public/common/content_constants.h" |
78 #include "content/public/test/test_browser_thread.h" | 79 #include "content/public/test/test_browser_thread.h" |
79 #include "googleurl/src/gurl.h" | 80 #include "googleurl/src/gurl.h" |
80 #include "grit/browser_resources.h" | 81 #include "grit/browser_resources.h" |
81 #include "net/cookies/canonical_cookie.h" | 82 #include "net/cookies/canonical_cookie.h" |
82 #include "net/cookies/cookie_monster.h" | 83 #include "net/cookies/cookie_monster.h" |
83 #include "net/cookies/cookie_options.h" | 84 #include "net/cookies/cookie_options.h" |
84 #include "net/url_request/url_request_context.h" | 85 #include "net/url_request/url_request_context.h" |
85 #include "net/url_request/url_request_context_getter.h" | 86 #include "net/url_request/url_request_context_getter.h" |
86 #include "sync/api/sync_error_factory.h" | 87 #include "sync/api/sync_error_factory.h" |
(...skipping 3333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3420 | 3421 |
3421 cookie_monster->GetAllCookiesForURLAsync( | 3422 cookie_monster->GetAllCookiesForURLAsync( |
3422 ext_url, | 3423 ext_url, |
3423 base::Bind(&ExtensionCookieCallback::GetAllCookiesCallback, | 3424 base::Bind(&ExtensionCookieCallback::GetAllCookiesCallback, |
3424 base::Unretained(&callback))); | 3425 base::Unretained(&callback))); |
3425 loop_.RunAllPending(); | 3426 loop_.RunAllPending(); |
3426 EXPECT_EQ(1U, callback.list_.size()); | 3427 EXPECT_EQ(1U, callback.list_.size()); |
3427 | 3428 |
3428 // Open a database. | 3429 // Open a database. |
3429 webkit_database::DatabaseTracker* db_tracker = | 3430 webkit_database::DatabaseTracker* db_tracker = |
3430 BrowserContext::GetDatabaseTracker(profile_.get()); | 3431 BrowserContext::GetDefaultStoragePartition(profile_.get())-> |
| 3432 GetDatabaseTracker(); |
3431 string16 db_name = UTF8ToUTF16("db"); | 3433 string16 db_name = UTF8ToUTF16("db"); |
3432 string16 description = UTF8ToUTF16("db_description"); | 3434 string16 description = UTF8ToUTF16("db_description"); |
3433 int64 size; | 3435 int64 size; |
3434 db_tracker->DatabaseOpened(origin_id, db_name, description, 1, &size); | 3436 db_tracker->DatabaseOpened(origin_id, db_name, description, 1, &size); |
3435 db_tracker->DatabaseClosed(origin_id, db_name); | 3437 db_tracker->DatabaseClosed(origin_id, db_name); |
3436 std::vector<webkit_database::OriginInfo> origins; | 3438 std::vector<webkit_database::OriginInfo> origins; |
3437 db_tracker->GetAllOriginsInfo(&origins); | 3439 db_tracker->GetAllOriginsInfo(&origins); |
3438 EXPECT_EQ(1U, origins.size()); | 3440 EXPECT_EQ(1U, origins.size()); |
3439 EXPECT_EQ(origin_id, origins[0].GetOrigin()); | 3441 EXPECT_EQ(origin_id, origins[0].GetOrigin()); |
3440 | 3442 |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3531 | 3533 |
3532 cookie_monster->GetAllCookiesForURLAsync( | 3534 cookie_monster->GetAllCookiesForURLAsync( |
3533 origin1, | 3535 origin1, |
3534 base::Bind(&ExtensionCookieCallback::GetAllCookiesCallback, | 3536 base::Bind(&ExtensionCookieCallback::GetAllCookiesCallback, |
3535 base::Unretained(&callback))); | 3537 base::Unretained(&callback))); |
3536 loop_.RunAllPending(); | 3538 loop_.RunAllPending(); |
3537 EXPECT_EQ(1U, callback.list_.size()); | 3539 EXPECT_EQ(1U, callback.list_.size()); |
3538 | 3540 |
3539 // Open a database. | 3541 // Open a database. |
3540 webkit_database::DatabaseTracker* db_tracker = | 3542 webkit_database::DatabaseTracker* db_tracker = |
3541 BrowserContext::GetDatabaseTracker(profile_.get()); | 3543 BrowserContext::GetDefaultStoragePartition(profile_.get())-> |
| 3544 GetDatabaseTracker(); |
3542 string16 db_name = UTF8ToUTF16("db"); | 3545 string16 db_name = UTF8ToUTF16("db"); |
3543 string16 description = UTF8ToUTF16("db_description"); | 3546 string16 description = UTF8ToUTF16("db_description"); |
3544 int64 size; | 3547 int64 size; |
3545 db_tracker->DatabaseOpened(origin_id, db_name, description, 1, &size); | 3548 db_tracker->DatabaseOpened(origin_id, db_name, description, 1, &size); |
3546 db_tracker->DatabaseClosed(origin_id, db_name); | 3549 db_tracker->DatabaseClosed(origin_id, db_name); |
3547 std::vector<webkit_database::OriginInfo> origins; | 3550 std::vector<webkit_database::OriginInfo> origins; |
3548 db_tracker->GetAllOriginsInfo(&origins); | 3551 db_tracker->GetAllOriginsInfo(&origins); |
3549 EXPECT_EQ(1U, origins.size()); | 3552 EXPECT_EQ(1U, origins.size()); |
3550 EXPECT_EQ(origin_id, origins[0].GetOrigin()); | 3553 EXPECT_EQ(origin_id, origins[0].GetOrigin()); |
3551 | 3554 |
(...skipping 1849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5401 // This should NOT trigger an alert. | 5404 // This should NOT trigger an alert. |
5402 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", | 5405 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", |
5403 data_dir_.AppendASCII("hosted_app.crx")); | 5406 data_dir_.AppendASCII("hosted_app.crx")); |
5404 | 5407 |
5405 service_->CheckForExternalUpdates(); | 5408 service_->CheckForExternalUpdates(); |
5406 loop_.RunAllPending(); | 5409 loop_.RunAllPending(); |
5407 | 5410 |
5408 ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get())); | 5411 ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get())); |
5409 ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size()); | 5412 ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size()); |
5410 } | 5413 } |
OLD | NEW |