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

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

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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/dll_redirector_test.cc ('k') | chrome_frame/test/http_negotiate_unittest.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 "chrome_frame/test/mock_ie_event_sink_actions.h" 5 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
6 #include "chrome_frame/test/mock_ie_event_sink_test.h" 6 #include "chrome_frame/test/mock_ie_event_sink_test.h"
7 #include "base/rand_util.h" 7 #include "base/rand_util.h"
8 8
9 namespace chrome_frame_test { 9 namespace chrome_frame_test {
10 10
11 class TestData { 11 class TestData {
12 public: 12 public:
13 TestData(const std::string& value, bool in_header, LoadedInRenderer expected) 13 TestData(const std::string& value, bool in_header, LoadedInRenderer expected)
14 : value_(value), 14 : value_(value),
15 in_header_(in_header), 15 in_header_(in_header),
16 expected_(expected), 16 expected_(expected),
17 name_(base::IntToString(base::RandInt(0, 1000))) { 17 name_(base::IntToString(base::RandInt(0, 1000))) {
18 } 18 }
19 19
20 LoadedInRenderer GetExpectedRenderer() const { 20 LoadedInRenderer GetExpectedRenderer() const {
21 return expected_; 21 return expected_;
22 } 22 }
23 23
24 std::wstring GetPath() const { 24 std::wstring GetPath() const {
25 return ASCIIToWide("/" + name_); 25 return base::ASCIIToWide("/" + name_);
26 } 26 }
27 27
28 std::wstring GetUrl(MockWebServer* server_mock) const { 28 std::wstring GetUrl(MockWebServer* server_mock) const {
29 return server_mock->Resolve(ASCIIToWide(name_)); 29 return server_mock->Resolve(base::ASCIIToWide(name_));
30 } 30 }
31 31
32 void ExpectOnServer(MockWebServer* server_mock) const { 32 void ExpectOnServer(MockWebServer* server_mock) const {
33 EXPECT_CALL(*server_mock, Get(testing::_, GetPath(), testing::_)) 33 EXPECT_CALL(*server_mock, Get(testing::_, GetPath(), testing::_))
34 .Times(testing::AnyNumber()) 34 .Times(testing::AnyNumber())
35 .WillRepeatedly(SendFast(GetHeaders(), GetHtml())); 35 .WillRepeatedly(SendFast(GetHeaders(), GetHtml()));
36 } 36 }
37 37
38 std::string GetHeaders() const { 38 std::string GetHeaders() const {
39 std::ostringstream headers; 39 std::ostringstream headers;
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 GetParam().ExpectOnServer(&server_mock_); 178 GetParam().ExpectOnServer(&server_mock_);
179 ie_mock_.ExpectNavigation(expected_renderer, url); 179 ie_mock_.ExpectNavigation(expected_renderer, url);
180 180
181 EXPECT_CALL(ie_mock_, OnLoad(expected_renderer, testing::StrEq(url))) 181 EXPECT_CALL(ie_mock_, OnLoad(expected_renderer, testing::StrEq(url)))
182 .WillOnce(CloseBrowserMock(&ie_mock_)); 182 .WillOnce(CloseBrowserMock(&ie_mock_));
183 183
184 LaunchIEAndNavigate(url); 184 LaunchIEAndNavigate(url);
185 } 185 }
186 186
187 } // namespace chrome_frame_test 187 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « chrome_frame/test/dll_redirector_test.cc ('k') | chrome_frame/test/http_negotiate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698