summaryrefslogtreecommitdiffstats
path: root/chrome_frame/cfproxy_test.cc
diff options
context:
space:
mode:
authorstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 18:11:26 +0000
committerstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 18:11:26 +0000
commit68a6606aca5a3496fa8bcf4fbbfcda0889d6417c (patch)
tree5a7f66b86a59945e7368eb718140ecf1b25bd5a8 /chrome_frame/cfproxy_test.cc
parent7f8e5215d51bee90705542e4f32a4bbaef4ab48f (diff)
downloadchromium_src-68a6606aca5a3496fa8bcf4fbbfcda0889d6417c.zip
chromium_src-68a6606aca5a3496fa8bcf4fbbfcda0889d6417c.tar.gz
chromium_src-68a6606aca5a3496fa8bcf4fbbfcda0889d6417c.tar.bz2
Fix the ChromeFrame Launch timeout test - mock destruction order.
TBR=amit Review URL: http://codereview.chromium.org/3588010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/cfproxy_test.cc')
-rw-r--r--chrome_frame/cfproxy_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/cfproxy_test.cc b/chrome_frame/cfproxy_test.cc
index a2b576d..c5bda7a 100644
--- a/chrome_frame/cfproxy_test.cc
+++ b/chrome_frame/cfproxy_test.cc
@@ -199,9 +199,9 @@ TEST(ChromeProxy, SharedProxy) {
TEST(ChromeProxy, LaunchTimeout) {
base::WaitableEvent done(true, false);
- StrictMock<MockFactory> factory;
StrictMock<MockCFProxyTraits> api;
StrictMock<MockChromeProxyDelegate> delegate;
+ StrictMock<MockFactory> factory;
CFProxy* proxy = new CFProxy(&api);
EXPECT_CALL(delegate, tab_handle()).WillRepeatedly(Return(0));