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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 #include "chrome/test/base/testing_profile.h" | 68 #include "chrome/test/base/testing_profile.h" |
69 #include "content/public/browser/dom_storage_context.h" | 69 #include "content/public/browser/dom_storage_context.h" |
70 #include "content/public/browser/indexed_db_context.h" | 70 #include "content/public/browser/indexed_db_context.h" |
71 #include "content/public/browser/notification_registrar.h" | 71 #include "content/public/browser/notification_registrar.h" |
72 #include "content/public/browser/notification_service.h" | 72 #include "content/public/browser/notification_service.h" |
73 #include "content/public/browser/plugin_service.h" | 73 #include "content/public/browser/plugin_service.h" |
74 #include "content/public/common/content_constants.h" | 74 #include "content/public/common/content_constants.h" |
75 #include "content/public/test/test_browser_thread.h" | 75 #include "content/public/test/test_browser_thread.h" |
76 #include "googleurl/src/gurl.h" | 76 #include "googleurl/src/gurl.h" |
77 #include "grit/browser_resources.h" | 77 #include "grit/browser_resources.h" |
| 78 #include "net/cookies/canonical_cookie.h" |
78 #include "net/cookies/cookie_monster.h" | 79 #include "net/cookies/cookie_monster.h" |
79 #include "net/cookies/cookie_options.h" | 80 #include "net/cookies/cookie_options.h" |
80 #include "net/url_request/url_request_context.h" | 81 #include "net/url_request/url_request_context.h" |
81 #include "net/url_request/url_request_context_getter.h" | 82 #include "net/url_request/url_request_context_getter.h" |
82 #include "sync/api/sync_error_factory.h" | 83 #include "sync/api/sync_error_factory.h" |
83 #include "sync/api/sync_error_factory_mock.h" | 84 #include "sync/api/sync_error_factory_mock.h" |
84 #include "sync/protocol/app_specifics.pb.h" | 85 #include "sync/protocol/app_specifics.pb.h" |
85 #include "sync/protocol/extension_specifics.pb.h" | 86 #include "sync/protocol/extension_specifics.pb.h" |
86 #include "sync/protocol/sync.pb.h" | 87 #include "sync/protocol/sync.pb.h" |
87 #include "testing/gtest/include/gtest/gtest.h" | 88 #include "testing/gtest/include/gtest/gtest.h" |
(...skipping 5146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5234 // This should NOT trigger an alert. | 5235 // This should NOT trigger an alert. |
5235 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", | 5236 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", |
5236 data_dir_.AppendASCII("hosted_app.crx")); | 5237 data_dir_.AppendASCII("hosted_app.crx")); |
5237 | 5238 |
5238 service_->CheckForExternalUpdates(); | 5239 service_->CheckForExternalUpdates(); |
5239 loop_.RunAllPending(); | 5240 loop_.RunAllPending(); |
5240 | 5241 |
5241 ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get())); | 5242 ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get())); |
5242 ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size()); | 5243 ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size()); |
5243 } | 5244 } |
OLD | NEW |