summaryrefslogtreecommitdiffstats
path: root/chrome/browser/background
diff options
context:
space:
mode:
authorasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-28 02:07:30 +0000
committerasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-28 02:07:30 +0000
commitc1d05aaf3fa0d974facfd52e02f27b6a7a2d265d (patch)
tree7860ec49ad86186ee5689cc1357b43f31a532a6d /chrome/browser/background
parent03536444cded4963dd7edc5d5b77605a16140e25 (diff)
downloadchromium_src-c1d05aaf3fa0d974facfd52e02f27b6a7a2d265d.zip
chromium_src-c1d05aaf3fa0d974facfd52e02f27b6a7a2d265d.tar.gz
chromium_src-c1d05aaf3fa0d974facfd52e02f27b6a7a2d265d.tar.bz2
Adding an experimental app notification API.
BUG=86958 TEST=none for now Review URL: http://codereview.chromium.org/7187023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/background')
-rw-r--r--chrome/browser/background/background_application_list_model_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc
index 530c76b..594e4a73 100644
--- a/chrome/browser/background/background_application_list_model_unittest.cc
+++ b/chrome/browser/background/background_application_list_model_unittest.cc
@@ -134,7 +134,7 @@ TEST_F(BackgroundApplicationListModelTest, LoadExplicitExtensions) {
ASSERT_EQ(0U, model->size());
}
-typedef std::set<scoped_refptr<Extension> > ExtensionSet;
+typedef std::set<scoped_refptr<Extension> > ExtensionCollection;
namespace {
std::string GenerateUniqueExtensionName() {
@@ -160,7 +160,7 @@ TEST_F(BackgroundApplicationListModelTest, LoadRandomExtension) {
ASSERT_EQ(0U, model->size());
static const int kIterations = 500;
- ExtensionSet extensions;
+ ExtensionCollection extensions;
size_t count = 0;
size_t expected = 0;
srand(RANDOM_SEED);
@@ -183,7 +183,7 @@ TEST_F(BackgroundApplicationListModelTest, LoadRandomExtension) {
ASSERT_EQ(count, service->extensions()->size());
ASSERT_EQ(expected, model->size());
} else { // Maybe remove an extension.
- ExtensionSet::iterator cursor = extensions.begin();
+ ExtensionCollection::iterator cursor = extensions.begin();
if (cursor == extensions.end()) {
// Nothing to remove. Just verify accounting.
ASSERT_EQ(0U, count);