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

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

Issue 12321062: base: Move MemoryMappedFile out of file_util.h and into its own header file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chrome_frame again Created 7 years, 10 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
« no previous file with comments | « chrome/renderer/spellchecker/spellcheck.h ('k') | chrome_frame/test/test_server.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <string> 5 #include <string>
6 6
7 #include "base/file_util.h"
7 #include "base/test/test_file_util.h" 8 #include "base/test/test_file_util.h"
8 #include "base/win/scoped_comptr.h" 9 #include "base/win/scoped_comptr.h"
9 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
10 #include "chrome_frame/test/chrome_frame_test_utils.h" 11 #include "chrome_frame/test/chrome_frame_test_utils.h"
11 #include "chrome_frame/test/chrome_frame_ui_test_utils.h" 12 #include "chrome_frame/test/chrome_frame_ui_test_utils.h"
12 #include "chrome_frame/test/mock_ie_event_sink_actions.h" 13 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
13 #include "chrome_frame/test/mock_ie_event_sink_test.h" 14 #include "chrome_frame/test/mock_ie_event_sink_test.h"
14 #include "net/http/http_util.h" 15 #include "net/http/http_util.h"
15 16
16 // Needed for CreateFunctor. 17 // Needed for CreateFunctor.
(...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 .WillOnce(CloseBrowserMock( 1282 .WillOnce(CloseBrowserMock(
1282 &no_referrer_target_opener_window_mock)); 1283 &no_referrer_target_opener_window_mock));
1283 1284
1284 EXPECT_CALL(no_referrer_target_opener_window_mock, OnQuit()) 1285 EXPECT_CALL(no_referrer_target_opener_window_mock, OnQuit())
1285 .WillOnce(CloseBrowserMock(&ie_mock_)); 1286 .WillOnce(CloseBrowserMock(&ie_mock_));
1286 1287
1287 LaunchIENavigateAndLoop(initial_url, kChromeFrameVeryLongNavigationTimeout); 1288 LaunchIENavigateAndLoop(initial_url, kChromeFrameVeryLongNavigationTimeout);
1288 } 1289 }
1289 1290
1290 } // namespace chrome_frame_test 1291 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « chrome/renderer/spellchecker/spellcheck.h ('k') | chrome_frame/test/test_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698