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

Unified Diff: chrome/browser/background/background_application_list_model_unittest.cc

Issue 8789018: Revert 113047 - Make ExtensionService use ExtensionSet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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
Index: chrome/browser/background/background_application_list_model_unittest.cc
===================================================================
--- chrome/browser/background/background_application_list_model_unittest.cc (revision 113069)
+++ chrome/browser/background/background_application_list_model_unittest.cc (working copy)
@@ -60,11 +60,8 @@
}
std::string error;
scoped_refptr<Extension> extension = Extension::Create(
- bogus_file_path().AppendASCII(name),
- Extension::INVALID,
- manifest,
- Extension::STRICT_ERROR_CHECKS,
- &error);
+ bogus_file_path().AppendASCII(name), Extension::INVALID, manifest,
+ Extension::STRICT_ERROR_CHECKS, &error);
// Cannot ASSERT_* here because that attempts an illegitimate return.
// Cannot EXPECT_NE here because that assumes non-pointers unlike EXPECT_EQ
EXPECT_TRUE(extension.get() != NULL) << error;
@@ -108,7 +105,7 @@
ASSERT_TRUE(service);
ASSERT_TRUE(service->is_ready());
ASSERT_TRUE(service->extensions());
- ASSERT_TRUE(service->extensions()->is_empty());
+ ASSERT_TRUE(service->extensions()->empty());
scoped_ptr<BackgroundApplicationListModel> model(
new BackgroundApplicationListModel(profile_.get()));
ASSERT_EQ(0U, model->size());
@@ -174,7 +171,7 @@
ASSERT_TRUE(service);
ASSERT_TRUE(service->is_ready());
ASSERT_TRUE(service->extensions());
- ASSERT_TRUE(service->extensions()->is_empty());
+ ASSERT_TRUE(service->extensions()->empty());
scoped_ptr<BackgroundApplicationListModel> model(
new BackgroundApplicationListModel(profile_.get()));
ASSERT_EQ(0U, model->size());
@@ -313,7 +310,7 @@
ASSERT_TRUE(service);
ASSERT_TRUE(service->is_ready());
ASSERT_TRUE(service->extensions());
- ASSERT_TRUE(service->extensions()->is_empty());
+ ASSERT_TRUE(service->extensions()->empty());
scoped_ptr<BackgroundApplicationListModel> model(
new BackgroundApplicationListModel(profile_.get()));
ASSERT_EQ(0U, model->size());
Property changes on: chrome/browser/background/background_application_list_model_unittest.cc
___________________________________________________________________
Added: svn:mergeinfo

Powered by Google App Engine
This is Rietveld 408576698