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

Side by Side Diff: net/proxy/proxy_script_fetcher_unittest.cc

Issue 3058027: Add #include utf_string_conversions.h to all files that use ASCIIToWide and... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 4 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 | « net/proxy/proxy_resolver_winhttp.cc ('k') | net/proxy/proxy_service_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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "net/proxy/proxy_script_fetcher.h" 5 #include "net/proxy/proxy_script_fetcher.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/utf_string_conversions.h"
10 #include "net/base/net_util.h" 11 #include "net/base/net_util.h"
11 #include "net/base/ssl_config_service_defaults.h" 12 #include "net/base/ssl_config_service_defaults.h"
12 #include "net/base/test_completion_callback.h" 13 #include "net/base/test_completion_callback.h"
13 #include "net/disk_cache/disk_cache.h" 14 #include "net/disk_cache/disk_cache.h"
14 #include "net/http/http_cache.h" 15 #include "net/http/http_cache.h"
15 #include "net/url_request/url_request_unittest.h" 16 #include "net/url_request/url_request_unittest.h"
16 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
17 #include "testing/platform_test.h" 18 #include "testing/platform_test.h"
18 19
19 // TODO(eroman): 20 // TODO(eroman):
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 string16 text; 314 string16 text;
314 TestCompletionCallback callback; 315 TestCompletionCallback callback;
315 int result = pac_fetcher->Fetch(url, &text, &callback); 316 int result = pac_fetcher->Fetch(url, &text, &callback);
316 EXPECT_EQ(ERR_IO_PENDING, result); 317 EXPECT_EQ(ERR_IO_PENDING, result);
317 EXPECT_EQ(OK, callback.WaitForResult()); 318 EXPECT_EQ(OK, callback.WaitForResult());
318 EXPECT_EQ(ASCIIToUTF16("This was encoded as UTF-16BE.\n"), text); 319 EXPECT_EQ(ASCIIToUTF16("This was encoded as UTF-16BE.\n"), text);
319 } 320 }
320 } 321 }
321 322
322 } // namespace net 323 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_winhttp.cc ('k') | net/proxy/proxy_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698