summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-25 23:07:53 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-25 23:07:53 +0000
commit0eea06f6952b120a77273e2e5f2e961874f51d7d (patch)
tree58fe3264b921c7400dff7b03aa55ccbdf34c8b0e /chrome/browser
parentd652a8d78ff2ccfb623481287577f23bebaebfc5 (diff)
downloadchromium_src-0eea06f6952b120a77273e2e5f2e961874f51d7d.zip
chromium_src-0eea06f6952b120a77273e2e5f2e961874f51d7d.tar.gz
chromium_src-0eea06f6952b120a77273e2e5f2e961874f51d7d.tar.bz2
[Sync] Fix bug in ExtensionUpdater introduced by r81501
Basically, r81501 broke ExtensionUpdater::CheckSoon(), which is relied on by extension/app/theme sync. BUG=80496 TEST=Open two browser instances with theme sync enabled. Install a new theme on one browser. It should show up in the other. Repeat a few times. Review URL: http://codereview.chromium.org/6905005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82943 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/extensions/extension_updater.cc3
-rw-r--r--chrome/browser/extensions/extension_updater_unittest.cc9
2 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
index b417545..ff17eff 100644
--- a/chrome/browser/extensions/extension_updater.cc
+++ b/chrome/browser/extensions/extension_updater.cc
@@ -918,7 +918,8 @@ void ExtensionUpdater::CheckSoon() {
}
if (BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
- method_factory_.NewRunnableMethod(&ExtensionUpdater::CheckNow))) {
+ method_factory_.NewRunnableMethod(
+ &ExtensionUpdater::DoCheckSoon))) {
will_check_soon_ = true;
} else {
NOTREACHED();
diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc
index 817de10..aca65c4 100644
--- a/chrome/browser/extensions/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/extension_updater_unittest.cc
@@ -270,9 +270,10 @@ class ExtensionUpdaterTest : public testing::Test {
updater->TimerFired();
}
- static void SimulateCheckSoon(ExtensionUpdater* updater) {
- EXPECT_TRUE(updater->will_check_soon_);
- updater->DoCheckSoon();
+ static void SimulateCheckSoon(const ExtensionUpdater& updater,
+ MessageLoop* message_loop) {
+ EXPECT_TRUE(updater.will_check_soon_);
+ message_loop->RunAllPending();
}
// Adds a Result with the given data to results.
@@ -1133,7 +1134,7 @@ TEST(ExtensionUpdaterTest, TestCheckSoon) {
EXPECT_TRUE(updater.WillCheckSoon());
updater.CheckSoon();
EXPECT_TRUE(updater.WillCheckSoon());
- ExtensionUpdaterTest::SimulateCheckSoon(&updater);
+ ExtensionUpdaterTest::SimulateCheckSoon(updater, &message_loop);
EXPECT_FALSE(updater.WillCheckSoon());
updater.CheckSoon();
EXPECT_TRUE(updater.WillCheckSoon());