chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc - Issue 177003015: Pull AsyncApiFunction out of src/chrome

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

Unified Diff: chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc

Issue 177003015: Pull AsyncApiFunction out of src/chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase for storage_api Created 6 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/sockets_tcp/tcp_socket_event_dispatcher.h ('k') | chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc

diff --git a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc

index 8b98d6c44589ac92d7b42d37debd15d764ca567c..174f9a178781b27335dd1244567af26044c18b9b 100644

--- a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc

+++ b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc

@@ -6,7 +6,6 @@

#include "chrome/browser/extensions/api/socket/tcp_socket.h"

#include "chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h"

-#include "chrome/browser/profiles/profile.h"

#include "chrome/common/extensions/api/sockets/sockets_manifest_data.h"

#include "chrome/common/extensions/permissions/socket_permission.h"

#include "content/public/common/socket_permission_request.h"

@@ -130,7 +129,8 @@ bool SocketsTcpServerSetPausedFunction::Prepare() {

params_ = api::sockets_tcp_server::SetPaused::Params::Create(*args_);

EXTENSION_FUNCTION_VALIDATE(params_.get());

- socket_event_dispatcher_ = TCPServerSocketEventDispatcher::Get(GetProfile());

+ socket_event_dispatcher_ =

+ TCPServerSocketEventDispatcher::Get(browser_context());

DCHECK(socket_event_dispatcher_) << "There is no socket event dispatcher. "

"If this assertion is failing during a test, then it is likely that "

"TestExtensionSystem is failing to provide an instance of "

@@ -165,7 +165,8 @@ bool SocketsTcpServerListenFunction::Prepare() {

params_ = api::sockets_tcp_server::Listen::Params::Create(*args_);