ios/web/public/origin_util.mm - Issue 2385533002: Replace usage of GURL(origin.Serialize()) with origin.GetURL()

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ios/web/public/origin_util.mm

Issue 2385533002: Replace usage of GURL(origin.Serialize()) with origin.GetURL() (Closed)

Patch Set: rebase and fix up some includes Created 4 years, 2 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

« no previous file with comments | « extensions/browser/extension_web_contents_observer.cc ('k') | net/base/registry_controlled_domains/registry_controlled_domain.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 #import "ios/web/public/origin_util.h"	5 #import "ios/web/public/origin_util.h"

6	6

7 #import <WebKit/WebKit.h>	7 #import <WebKit/WebKit.h>

8	8

9 #include "base/numerics/safe_conversions.h"	9 #include "base/numerics/safe_conversions.h"

10 #include "base/strings/sys_string_conversions.h"	10 #include "base/strings/sys_string_conversions.h"

(...skipping 23 matching lines...) Expand all Loading...
34 return false;	34 return false;

35 }	35 }

36	36

37 GURL GURLOriginWithWKSecurityOrigin(WKSecurityOrigin* origin) {	37 GURL GURLOriginWithWKSecurityOrigin(WKSecurityOrigin* origin) {

38 if (!origin)	38 if (!origin)

39 return GURL();	39 return GURL();

40	40

41 url::SchemeHostPort origin_tuple(base::SysNSStringToUTF8(origin.protocol),	41 url::SchemeHostPort origin_tuple(base::SysNSStringToUTF8(origin.protocol),

42 base::SysNSStringToUTF8(origin.host),	42 base::SysNSStringToUTF8(origin.host),

43 base::checked_cast<uint16_t>(origin.port));	43 base::checked_cast<uint16_t>(origin.port));

44 return GURL(origin_tuple.Serialize());	44 return origin_tuple.GetURL();
	sdefresne 2016/10/04 10:59:33 It look like this code broke the iOS bots with a f It look like this code broke the iOS bots with a failing DCHECK. Charlie Harrison 2016/10/04 12:15:22 Yup, I think this indicates problems with the depe Show quoted text On 2016/10/04 10:59:33, sdefresne wrote: > It look like this code broke the iOS bots with a failing DCHECK. Yup, I think this indicates problems with the dependent PS that already landed :/ I'll investigate.
45 }	45 }

46	46

47 } // namespace web	47 } // namespace web

OLD	NEW