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

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

Issue 339058: Removes fallback from Prefs to LoadExtension on UI thread (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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/extensions_service.cc ('k') | chrome/test/data/extensions/bad/Preferences » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extensions_service_unittest.cc
===================================================================
--- chrome/browser/extensions/extensions_service_unittest.cc (revision 30464)
+++ chrome/browser/extensions/extensions_service_unittest.cc (working copy)
@@ -503,11 +503,6 @@
service_->Init();
loop_.RunAllPending();
- std::vector<std::string> errors = GetErrors();
- for (std::vector<std::string>::iterator err = errors.begin();
- err != errors.end(); ++err) {
- LOG(ERROR) << *err;
- }
ASSERT_EQ(3u, loaded_.size());
EXPECT_EQ(std::string(good0), loaded_[0]->id());
@@ -616,8 +611,8 @@
ASSERT_EQ(0u, loaded_.size());
EXPECT_TRUE(MatchPattern(GetErrors()[0],
- std::string("Could not load extension from '*'. * ") +
- base::JSONReader::kBadRootElementType)) << GetErrors()[0];
+ std::string("Could not load extension from '*'. ") +
+ extension_manifest_errors::kManifestUnreadable)) << GetErrors()[0];
EXPECT_TRUE(MatchPattern(GetErrors()[1],
std::string("Could not load extension from '*'. ") +
@@ -1110,7 +1105,7 @@
err != errors.end(); ++err) {
LOG(ERROR) << *err;
}
- EXPECT_EQ(2u, loaded_.size());
+ ASSERT_EQ(2u, loaded_.size());
EXPECT_NE(std::string(good0), loaded_[0]->id());
EXPECT_NE(std::string(good0), loaded_[1]->id());
« no previous file with comments | « chrome/browser/extensions/extensions_service.cc ('k') | chrome/test/data/extensions/bad/Preferences » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698