diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-02 23:18:26 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-02 23:18:26 +0000 |
| commit | 8ffad4ed0b910af30b2404fdfd26e44fa73c50c0 (patch) | |
| tree | 07b7e33da278ac1dd44159321e46217c7bdd494c /content/browser/security_exploit_browsertest.cc | |
| parent | b58d9ddb80eda7b620785fa52933b0161eb5fd1e (diff) | |
| download | chromium_src-8ffad4ed0b910af30b2404fdfd26e44fa73c50c0.zip chromium_src-8ffad4ed0b910af30b2404fdfd26e44fa73c50c0.tar.gz chromium_src-8ffad4ed0b910af30b2404fdfd26e44fa73c50c0.tar.bz2 | |
Introduce RenderProcessHostObserver::RenderProcessExited, use it in a new RenderProcessHostWatcher, and switch browser tests over to that new watcher.
BUG=170921
TEST=no change
Review URL: https://codereview.chromium.org/121493002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/security_exploit_browsertest.cc')
| -rw-r--r-- | content/browser/security_exploit_browsertest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc index fc648f0..62241ac 100644 --- a/content/browser/security_exploit_browsertest.cc +++ b/content/browser/security_exploit_browsertest.cc @@ -11,8 +11,6 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/common/view_messages.h" #include "content/public/browser/browser_context.h" -#include "content/public/browser/notification_service.h" -#include "content/public/browser/notification_types.h" #include "content/public/browser/storage_partition.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" @@ -107,9 +105,9 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, SetWebUIProperty) { EXPECT_EQ(0, shell()->web_contents()->GetRenderViewHost()->GetEnabledBindings()); - content::WindowedNotificationObserver terminated( - content::NOTIFICATION_RENDERER_PROCESS_CLOSED, - content::NotificationService::AllSources()); + content::RenderProcessHostWatcher terminated( + shell()->web_contents(), + content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); shell()->web_contents()->GetRenderViewHost()->SetWebUIProperty( "toolkit", "views"); terminated.Wait(); |