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

Side by Side Diff: chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc

Issue 11413050: chrome/browser: Update calls from RunAllPending() to RunUntilIdle(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/api/declarative/test_rules_registry.h" 5 #include "chrome/browser/extensions/api/declarative/test_rules_registry.h"
6 6
7 // Here we test the TestRulesRegistry which is the simplest possible 7 // Here we test the TestRulesRegistry which is the simplest possible
8 // implementation of RulesRegistryWithCache as a proxy for 8 // implementation of RulesRegistryWithCache as a proxy for
9 // RulesRegistryWithCache. 9 // RulesRegistryWithCache.
10 10
(...skipping 14 matching lines...) Expand all
25 public: 25 public:
26 RulesRegistryWithCacheTest() 26 RulesRegistryWithCacheTest()
27 : ui_(content::BrowserThread::UI, &message_loop_), 27 : ui_(content::BrowserThread::UI, &message_loop_),
28 registry_(new TestRulesRegistry()) {} 28 registry_(new TestRulesRegistry()) {}
29 29
30 virtual ~RulesRegistryWithCacheTest() {} 30 virtual ~RulesRegistryWithCacheTest() {}
31 31
32 virtual void TearDown() OVERRIDE { 32 virtual void TearDown() OVERRIDE {
33 // Make sure that deletion traits of all registries are executed. 33 // Make sure that deletion traits of all registries are executed.
34 registry_ = NULL; 34 registry_ = NULL;
35 message_loop_.RunAllPending(); 35 message_loop_.RunUntilIdle();
36 } 36 }
37 37
38 std::string AddRule(const std::string& extension_id, 38 std::string AddRule(const std::string& extension_id,
39 const std::string rule_id) { 39 const std::string rule_id) {
40 std::vector<linked_ptr<extensions::RulesRegistry::Rule> > add_rules; 40 std::vector<linked_ptr<extensions::RulesRegistry::Rule> > add_rules;
41 add_rules.push_back(make_linked_ptr(new extensions::RulesRegistry::Rule)); 41 add_rules.push_back(make_linked_ptr(new extensions::RulesRegistry::Rule));
42 add_rules[0]->id.reset(new std::string(rule_id)); 42 add_rules[0]->id.reset(new std::string(rule_id));
43 return registry_->AddRules(extension_id, add_rules); 43 return registry_->AddRules(extension_id, add_rules);
44 } 44 }
45 45
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 EXPECT_EQ("", AddRule(extension_id, rule_id)); 170 EXPECT_EQ("", AddRule(extension_id, rule_id));
171 EXPECT_EQ("", AddRule(extension2_id, rule_id)); 171 EXPECT_EQ("", AddRule(extension2_id, rule_id));
172 172
173 // Check that the correct rules are removed. 173 // Check that the correct rules are removed.
174 registry_->OnExtensionUnloaded(extension_id); 174 registry_->OnExtensionUnloaded(extension_id);
175 EXPECT_EQ(0, GetNumberOfRules(extension_id)); 175 EXPECT_EQ(0, GetNumberOfRules(extension_id));
176 EXPECT_EQ(1, GetNumberOfRules(extension2_id)); 176 EXPECT_EQ(1, GetNumberOfRules(extension2_id));
177 } 177 }
178 178
179 } // namespace extensions 179 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698