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

Side by Side Diff: trunk/src/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm

Issue 16897005: Revert 206507 "Move message_pump to base/message_loop." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 months 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 #import "chrome/browser/ui/cocoa/history_overlay_controller.h" 5 #import "chrome/browser/ui/cocoa/history_overlay_controller.h"
6 6
7 #import <QuartzCore/QuartzCore.h> 7 #import <QuartzCore/QuartzCore.h>
8 8
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/message_loop/message_pump_mac.h" 10 #include "base/message_pump_mac.h"
11 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 11 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
12 #import "third_party/ocmock/gtest_support.h" 12 #import "third_party/ocmock/gtest_support.h"
13 #import "third_party/ocmock/OCMock/OCMock.h" 13 #import "third_party/ocmock/OCMock/OCMock.h"
14 14
15 class HistoryOverlayControllerTest : public CocoaTest { 15 class HistoryOverlayControllerTest : public CocoaTest {
16 public: 16 public:
17 virtual void SetUp() { 17 virtual void SetUp() {
18 CocoaTest::SetUp(); 18 CocoaTest::SetUp();
19 19
20 // The overlay controller shows the panel in the superview of a given 20 // The overlay controller shows the panel in the superview of a given
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 }); 80 });
81 81
82 // Run the loop, which will dismiss the overlay. 82 // Run the loop, which will dismiss the overlay.
83 message_pump->Run(NULL); 83 message_pump->Run(NULL);
84 84
85 EXPECT_OCMOCK_VERIFY(mock); 85 EXPECT_OCMOCK_VERIFY(mock);
86 86
87 // After the animation runs, there should be no more animations. 87 // After the animation runs, there should be no more animations.
88 EXPECT_FALSE([[controller view] animations]); 88 EXPECT_FALSE([[controller view] animations]);
89 } 89 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698