OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "chrome/browser/extensions/app_notification.h" | 9 #include "chrome/browser/extensions/app_notification.h" |
10 #include "chrome/browser/extensions/app_notification_manager.h" | 10 #include "chrome/browser/extensions/app_notification_manager.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 ASSERT_TRUE(model_->loaded()); | 86 ASSERT_TRUE(model_->loaded()); |
87 } | 87 } |
88 | 88 |
89 virtual void TearDown() { | 89 virtual void TearDown() { |
90 WaitForFileThread(); | 90 WaitForFileThread(); |
91 } | 91 } |
92 | 92 |
93 static void PostQuitToUIThread() { | 93 static void PostQuitToUIThread() { |
94 BrowserThread::PostTask(BrowserThread::UI, | 94 BrowserThread::PostTask(BrowserThread::UI, |
95 FROM_HERE, | 95 FROM_HERE, |
96 new MessageLoop::QuitTask()); | 96 MessageLoop::QuitClosure()); |
97 } | 97 } |
98 | 98 |
99 static void WaitForFileThread() { | 99 static void WaitForFileThread() { |
100 BrowserThread::PostTask(BrowserThread::FILE, | 100 BrowserThread::PostTask(BrowserThread::FILE, |
101 FROM_HERE, | 101 FROM_HERE, |
102 base::Bind(&PostQuitToUIThread)); | 102 base::Bind(&PostQuitToUIThread)); |
103 MessageLoop::current()->Run(); | 103 MessageLoop::current()->Run(); |
104 } | 104 } |
105 | 105 |
106 AppNotificationManager* model() { return model_.get(); } | 106 AppNotificationManager* model() { return model_.get(); } |
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
610 | 610 |
611 EXPECT_EQ(3, processor()->change_list_size()); | 611 EXPECT_EQ(3, processor()->change_list_size()); |
612 EXPECT_TRUE(processor()->ContainsGuid(n1->guid())); | 612 EXPECT_TRUE(processor()->ContainsGuid(n1->guid())); |
613 SyncChange c1 = processor()->GetChangeByGuid(n1->guid()); | 613 SyncChange c1 = processor()->GetChangeByGuid(n1->guid()); |
614 AssertSyncChange(c1, SyncChange::ACTION_DELETE, *n1); | 614 AssertSyncChange(c1, SyncChange::ACTION_DELETE, *n1); |
615 SyncChange c2 = processor()->GetChangeByGuid(n2->guid()); | 615 SyncChange c2 = processor()->GetChangeByGuid(n2->guid()); |
616 AssertSyncChange(c2, SyncChange::ACTION_DELETE, *n2); | 616 AssertSyncChange(c2, SyncChange::ACTION_DELETE, *n2); |
617 SyncChange c3 = processor()->GetChangeByGuid(n3->guid()); | 617 SyncChange c3 = processor()->GetChangeByGuid(n3->guid()); |
618 AssertSyncChange(c3, SyncChange::ACTION_DELETE, *n3); | 618 AssertSyncChange(c3, SyncChange::ACTION_DELETE, *n3); |
619 } | 619 } |
OLD | NEW |