diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-17 01:03:21 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-17 01:03:21 +0000 |
| commit | 0c94bdf1740d0836fe7ad1fe9123b704682c9d70 (patch) | |
| tree | 93a6fb5f344ef654eb2f9d4e4d12027734ebfe76 /content | |
| parent | 4a432fc00c6d531769b8f2e086a94a3870e9c4ab (diff) | |
| download | chromium_src-0c94bdf1740d0836fe7ad1fe9123b704682c9d70.zip chromium_src-0c94bdf1740d0836fe7ad1fe9123b704682c9d70.tar.gz chromium_src-0c94bdf1740d0836fe7ad1fe9123b704682c9d70.tar.bz2 | |
Remove knowledge of nacl from content.
Content should not have knowledge of NaCl. Moving per process NaCl debug
stub port information to NaClBrowser.
More explicitly distiquish between the case where the debug port is not yet
known versus when it is unused.
Switch debug port to being a per-process value (as it is).
This relands r270907 with a fix to make it work with disable_nacl=1
and therefore ASAN.
BUG=None
TEST=trybots
R=jam@chromium.org,sehr@chromium.org
Review URL: https://codereview.chromium.org/286143010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271133 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
4 files changed, 1 insertions, 13 deletions
diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc index 97058a6..dd7d600 100644 --- a/content/browser/browser_child_process_host_impl.cc +++ b/content/browser/browser_child_process_host_impl.cc @@ -177,11 +177,6 @@ base::ProcessHandle BrowserChildProcessHostImpl::GetHandle() const { return child_process_->GetHandle(); } -void BrowserChildProcessHostImpl::SetNaClDebugStubPort(int port) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - data_.nacl_debug_stub_port = port; -} - void BrowserChildProcessHostImpl::SetName(const base::string16& name) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); data_.name = name; diff --git a/content/browser/browser_child_process_host_impl.h b/content/browser/browser_child_process_host_impl.h index 0f7a3df..b196551 100644 --- a/content/browser/browser_child_process_host_impl.h +++ b/content/browser/browser_child_process_host_impl.h @@ -53,7 +53,6 @@ class CONTENT_EXPORT BrowserChildProcessHostImpl virtual ChildProcessHost* GetHost() const OVERRIDE; virtual base::TerminationStatus GetTerminationStatus( bool known_dead, int* exit_code) OVERRIDE; - virtual void SetNaClDebugStubPort(int port) OVERRIDE; virtual void SetName(const base::string16& name) OVERRIDE; virtual void SetHandle(base::ProcessHandle handle) OVERRIDE; diff --git a/content/public/browser/browser_child_process_host.h b/content/public/browser/browser_child_process_host.h index a44b8d3..078eb86 100644 --- a/content/public/browser/browser_child_process_host.h +++ b/content/public/browser/browser_child_process_host.h @@ -71,9 +71,6 @@ class CONTENT_EXPORT BrowserChildProcessHost : public IPC::Sender { // this object. virtual void SetHandle(base::ProcessHandle handle) = 0; - // Set the nacl debug stub port of the process. - virtual void SetNaClDebugStubPort(int port) = 0; - #if defined(OS_MACOSX) && !defined(OS_IOS) // Returns a PortProvider used to get process metrics for child processes. static base::ProcessMetrics::PortProvider* GetPortProvider(); diff --git a/content/public/browser/child_process_data.h b/content/public/browser/child_process_data.h index 2807657..3683be9 100644 --- a/content/public/browser/child_process_data.h +++ b/content/public/browser/child_process_data.h @@ -28,11 +28,8 @@ struct ChildProcessData { // The handle to the process. base::ProcessHandle handle; - int nacl_debug_stub_port; - explicit ChildProcessData(int process_type) - : process_type(process_type), id(0), handle(base::kNullProcessHandle), - nacl_debug_stub_port(0) { + : process_type(process_type), id(0), handle(base::kNullProcessHandle) { } }; |