summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/pepper
diff options
context:
space:
mode:
authorygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-05 09:51:49 +0000
committerygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-05 09:51:49 +0000
commit7334c52684fb6099afab2e868a9451b2141f18de (patch)
tree8a2dedba28df9e5e73d87f7e55e733dc81e4288a /content/browser/renderer_host/pepper
parenta5407563071712bd0bb0f9977fc67599372ae53f (diff)
downloadchromium_src-7334c52684fb6099afab2e868a9451b2141f18de.zip
chromium_src-7334c52684fb6099afab2e868a9451b2141f18de.tar.gz
chromium_src-7334c52684fb6099afab2e868a9451b2141f18de.tar.bz2
Due to current permission check process (IO -> UI -> IO) some calls to UDPSocketPrivate interface can be intermixed (like SendTo and Close). So, some NOTREACHED() statements actually can be reached and must be removed.
BUG=170829 TEST=browser_tests:*{UDP|TCP}SocketPrivate* Review URL: https://chromiumcodereview.appspot.com/11871010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/pepper')
-rw-r--r--content/browser/renderer_host/pepper/pepper_message_filter.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.cc b/content/browser/renderer_host/pepper/pepper_message_filter.cc
index c58eb4a..430df2c4 100644
--- a/content/browser/renderer_host/pepper/pepper_message_filter.cc
+++ b/content/browser/renderer_host/pepper/pepper_message_filter.cc
@@ -255,7 +255,9 @@ void PepperMessageFilter::DoTCPConnect(bool allowed,
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
TCPSocketMap::iterator iter = tcp_sockets_.find(socket_id);
if (iter == tcp_sockets_.end()) {
- NOTREACHED();
+ // Due to current permission check process (IO -> UI -> IO) some
+ // calls to TCPSocketPrivate interface can be intermixed (like
+ // Connect and Close). So, NOTREACHED() is not needed there.
return;
}
@@ -287,7 +289,10 @@ void PepperMessageFilter::DoTCPConnectWithNetAddress(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
TCPSocketMap::iterator iter = tcp_sockets_.find(socket_id);
if (iter == tcp_sockets_.end()) {
- NOTREACHED();
+ // Due to current permission check process (IO -> UI -> IO) some
+ // calls to TCPSocketPrivate interface can be intermixed (like
+ // ConnectWithNetAddress and Close). So, NOTREACHED() is not
+ // needed there.
return;
}