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

Side by Side Diff: net/base/net_util_unittest.cc

Issue 19492015: net: Fix references to googleurl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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/base/escape.cc ('k') | net/websockets/websocket_channel.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 "net/base/net_util.h" 5 #include "net/base/net_util.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 1055 matching lines...) Expand 10 before | Expand all | Expand 10 after
1066 { 1066 {
1067 __LINE__, 1067 __LINE__,
1068 "http://www.google.com/test.html", 1068 "http://www.google.com/test.html",
1069 "", 1069 "",
1070 "", 1070 "",
1071 "", 1071 "",
1072 "", 1072 "",
1073 L"", 1073 L"",
1074 L"test.html" 1074 L"test.html"
1075 }, 1075 },
1076 { // Now that we use googleurl's ExtractFileName, this case falls back to 1076 { // Now that we use src/url's ExtractFileName, this case falls back to
1077 // the hostname. If this behavior is not desirable, we'd better change 1077 // the hostname. If this behavior is not desirable, we'd better change
1078 // ExtractFileName (in url_parse). 1078 // ExtractFileName (in url_parse).
1079 __LINE__, 1079 __LINE__,
1080 "http://www.google.com/path/", 1080 "http://www.google.com/path/",
1081 "", 1081 "",
1082 "", 1082 "",
1083 "", 1083 "",
1084 "", 1084 "",
1085 L"", 1085 L"",
1086 L"www.google.com" 1086 L"www.google.com"
(...skipping 2408 matching lines...) Expand 10 before | Expand all | Expand 10 after
3495 kUnsafePortableBasenames[i]))) << kUnsafePortableBasenames[i]; 3495 kUnsafePortableBasenames[i]))) << kUnsafePortableBasenames[i];
3496 if (!base::FilePath::StringType(kUnsafePortableBasenames[i]).empty()) { 3496 if (!base::FilePath::StringType(kUnsafePortableBasenames[i]).empty()) {
3497 EXPECT_FALSE(IsSafePortableRelativePath(safe_dirname.Append( 3497 EXPECT_FALSE(IsSafePortableRelativePath(safe_dirname.Append(
3498 base::FilePath(kUnsafePortableBasenames[i])))) 3498 base::FilePath(kUnsafePortableBasenames[i]))))
3499 << kUnsafePortableBasenames[i]; 3499 << kUnsafePortableBasenames[i];
3500 } 3500 }
3501 } 3501 }
3502 } 3502 }
3503 3503
3504 } // namespace net 3504 } // namespace net
OLDNEW
« no previous file with comments | « net/base/escape.cc ('k') | net/websockets/websocket_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698