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

Side by Side Diff: chrome_frame/test/delete_chrome_history_test.cc

Issue 10007043: Attempt to fix ChromeFrameTestWithWebServer tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added retry logic for WidgetModeIE_Version. Created 8 years, 8 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) 2011 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 <string> 5 #include <string>
6 6
7 #include "base/rand_util.h" 7 #include "base/rand_util.h"
8 #include "chrome/browser/webdata/autofill_table.h" 8 #include "chrome/browser/webdata/autofill_table.h"
9 #include "chrome/browser/webdata/web_database.h" 9 #include "chrome/browser/webdata/web_database.h"
10 #include "chrome/common/url_constants.h" 10 #include "chrome/common/url_constants.h"
11 #include "chrome/common/chrome_constants.h" 11 #include "chrome/common/chrome_constants.h"
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 .WillOnce(CloseBrowserMock(&ie_mock3_)); 319 .WillOnce(CloseBrowserMock(&ie_mock3_));
320 320
321 EXPECT_CALL(ie_mock3_, OnQuit()) 321 EXPECT_CALL(ie_mock3_, OnQuit())
322 .WillOnce(QUIT_LOOP(loop_)); 322 .WillOnce(QUIT_LOOP(loop_));
323 323
324 // Start it up. Everything else is triggered as mock actions. 324 // Start it up. Everything else is triggered as mock actions.
325 ASSERT_HRESULT_SUCCEEDED( 325 ASSERT_HRESULT_SUCCEEDED(
326 ie_mock_.event_sink()->LaunchIEAndNavigate(top_url, &ie_mock_)); 326 ie_mock_.event_sink()->LaunchIEAndNavigate(top_url, &ie_mock_));
327 327
328 // 3 navigations + 2 invocations of delete browser history == 5 328 // 3 navigations + 2 invocations of delete browser history == 5
329 loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds * 5); 329 loop_.RunFor(kChromeFrameLongNavigationTimeout * 5);
330 } 330 }
331 331
332 } // namespace chrome_frame_test 332 } // namespace chrome_frame_test
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698