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

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

Issue 16614002: Use a direct include of utf_string_conversions.h in chrome_frame/, chromeos/, cloud_print/, compone… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « chrome_frame/test/test_with_web_server.cc ('k') | chrome_frame/test/util_unittests.cc » ('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 <mshtmcid.h> 5 #include <mshtmcid.h>
6 #include <string> 6 #include <string>
7 7
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/strings/utf_string_conversions.h"
9 #include "base/test/test_file_util.h" 10 #include "base/test/test_file_util.h"
10 #include "base/utf_string_conversions.h"
11 #include "base/win/scoped_bstr.h" 11 #include "base/win/scoped_bstr.h"
12 #include "base/win/scoped_variant.h" 12 #include "base/win/scoped_variant.h"
13 #include "base/win/windows_version.h" 13 #include "base/win/windows_version.h"
14 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
15 #include "chrome_frame/test/chrome_frame_test_utils.h" 15 #include "chrome_frame/test/chrome_frame_test_utils.h"
16 #include "chrome_frame/test/chrome_frame_ui_test_utils.h" 16 #include "chrome_frame/test/chrome_frame_ui_test_utils.h"
17 #include "chrome_frame/test/mock_ie_event_sink_actions.h" 17 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
18 #include "chrome_frame/test/mock_ie_event_sink_test.h" 18 #include "chrome_frame/test/mock_ie_event_sink_test.h"
19 #include "chrome_frame/test/simulate_input.h" 19 #include "chrome_frame/test/simulate_input.h"
20 20
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 EXPECT_CALL(acc_observer_, OnMenuPopup(_)) 1075 EXPECT_CALL(acc_observer_, OnMenuPopup(_))
1076 .WillOnce(AccLeftClick(AccObjectMatcher(L"Forward"))); 1076 .WillOnce(AccLeftClick(AccObjectMatcher(L"Forward")));
1077 1077
1078 EXPECT_CALL(ie_mock_, OnLoad(IN_CF, StrEq(page3))) 1078 EXPECT_CALL(ie_mock_, OnLoad(IN_CF, StrEq(page3)))
1079 .WillOnce(CloseBrowserMock(&ie_mock_)); 1079 .WillOnce(CloseBrowserMock(&ie_mock_));
1080 1080
1081 LaunchIENavigateAndLoop(page1, kChromeFrameVeryLongNavigationTimeout); 1081 LaunchIENavigateAndLoop(page1, kChromeFrameVeryLongNavigationTimeout);
1082 } 1082 }
1083 1083
1084 } // namespace chrome_frame_test 1084 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « chrome_frame/test/test_with_web_server.cc ('k') | chrome_frame/test/util_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698