Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1672)

Unified Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 10696210: Making ExtensionService less dependent on Browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update based on discussion with Yoyo Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 4bbddf8c0e6c151214d501e0952090751750688b..dd611b94fafc3950158f37641702ded18c314064 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -32,7 +32,7 @@
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/extension_creator.h"
#include "chrome/browser/extensions/extension_error_reporter.h"
-#include "chrome/browser/extensions/extension_global_error.h"
+#include "chrome/browser/extensions/extension_error_ui.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_sorting.h"
#include "chrome/browser/extensions/extension_special_storage_policy.h"
@@ -5208,16 +5208,15 @@ TEST_F(ExtensionSourcePriorityTest, InstallExternalBlocksSyncRequest) {
TEST_F(ExtensionServiceTest, AlertableExtensionHappyPath) {
InitializeEmptyExtensionService();
- scoped_ptr<ExtensionGlobalError> extension_global_error(
- new ExtensionGlobalError(service_));
+ scoped_ptr<ExtensionErrorUI> extension_error_ui(
+ ExtensionErrorUI::Create(service_));
MockExtensionProvider* provider =
new MockExtensionProvider(service_, Extension::EXTERNAL_PREF);
AddMockExternalProvider(provider);
// Should return false, meaning there aren't any extensions that the user
// needs to know about.
- ASSERT_FALSE(service_->PopulateExtensionGlobalError(
- extension_global_error.get()));
+ ASSERT_FALSE(service_->PopulateExtensionErrorUI(extension_error_ui.get()));
// This is a normal extension, installed normally.
// This should NOT trigger an alert.
@@ -5238,7 +5237,6 @@ TEST_F(ExtensionServiceTest, AlertableExtensionHappyPath) {
service_->CheckForExternalUpdates();
loop_.RunAllPending();
- ASSERT_TRUE(service_->PopulateExtensionGlobalError(
- extension_global_error.get()));
- ASSERT_EQ(1u, extension_global_error->get_external_extension_ids()->size());
+ ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get()));
+ ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size());
}
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698