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

Side by Side Diff: chrome_frame/test/mock_ie_event_sink_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
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 "chrome_frame/test/mock_ie_event_sink_test.h" 5 #include "chrome_frame/test/mock_ie_event_sink_test.h"
6 6
7 #include <sstream> 7 #include <sstream>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/win/scoped_variant.h" 10 #include "base/win/scoped_variant.h"
11 #include "chrome_frame/test/mock_ie_event_sink_actions.h" 11 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
12 12
13 // Needed for CreateFunctor. 13 // Needed for CreateFunctor.
14 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING 14 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
15 #include "testing/gmock_mutant.h" 15 #include "testing/gmock_mutant.h"
16 16
17 using testing::_; 17 using testing::_;
18 using testing::Cardinality; 18 using testing::Cardinality;
19 using testing::Exactly; 19 using testing::Exactly;
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 const std::wstring& relative_path) { 228 const std::wstring& relative_path) {
229 return server_mock_.root_dir().Append(relative_path); 229 return server_mock_.root_dir().Append(relative_path);
230 } 230 }
231 231
232 std::wstring MockIEEventSinkTest::GetTestUrl( 232 std::wstring MockIEEventSinkTest::GetTestUrl(
233 const std::wstring& relative_path) { 233 const std::wstring& relative_path) {
234 return server_mock_.Resolve(relative_path.c_str()); 234 return server_mock_.Resolve(relative_path.c_str());
235 } 235 }
236 236
237 } // namespace chrome_frame_test 237 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « chrome_frame/test/mock_ie_event_sink_test.h ('k') | chrome_frame/test/perf/chrome_frame_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698