Skip to content

Commit 51e6a10

Browse files
Ivan Efremovbbondy
Ivan Efremov
authored andcommitted
Revert using frame_tree_node_id, since this breaks tests.
1 parent 783ee0b commit 51e6a10

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

browser/net/brave_network_delegate_base.cc

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@ using net::URLRequest;
2828
namespace {
2929

3030
content::WebContents* GetWebContentsFromProcessAndFrameId(
31-
int render_process_id, int render_frame_id, int frame_tree_node_id) {
31+
int render_process_id, int render_frame_id) {
3232
if (render_process_id) {
3333
content::RenderFrameHost* rfh =
3434
content::RenderFrameHost::FromID(render_process_id, render_frame_id);
3535
return content::WebContents::FromRenderFrameHost(rfh);
3636
}
37-
return content::WebContents::FromFrameTreeNodeId(frame_tree_node_id);
37+
// TODO(iefremov): Seems like a typo?
38+
// issues/2263
39+
return content::WebContents::FromFrameTreeNodeId(render_frame_id);
3840
}
3941

4042
} // namespace
@@ -164,8 +166,7 @@ bool BraveNetworkDelegateBase::OnCanGetCookies(const URLRequest& request,
164166
base::RepeatingCallback<content::WebContents*(void)> wc_getter =
165167
base::BindRepeating(&GetWebContentsFromProcessAndFrameId,
166168
ctx->render_process_id,
167-
ctx->render_frame_id,
168-
ctx->frame_tree_node_id);
169+
ctx->render_frame_id);
169170
base::PostTaskWithTraits(
170171
FROM_HERE, {BrowserThread::UI},
171172
base::BindOnce(&TabSpecificContentSettings::CookiesRead, wc_getter,
@@ -192,8 +193,7 @@ bool BraveNetworkDelegateBase::OnCanSetCookie(const URLRequest& request,
192193
base::RepeatingCallback<content::WebContents*(void)> wc_getter =
193194
base::BindRepeating(&GetWebContentsFromProcessAndFrameId,
194195
ctx->render_process_id,
195-
ctx->render_frame_id,
196-
ctx->frame_tree_node_id);
196+
ctx->render_frame_id);
197197
base::PostTaskWithTraits(
198198
FROM_HERE, {BrowserThread::UI},
199199
base::BindOnce(&TabSpecificContentSettings::CookieChanged, wc_getter,

0 commit comments

Comments
 (0)