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 /chrome/browser/metrics/metrics_service_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 'chrome/browser/metrics/metrics_service_browsertest.cc')
| -rw-r--r-- | chrome/browser/metrics/metrics_service_browsertest.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc index 228dbd3..56caccc 100644 --- a/chrome/browser/metrics/metrics_service_browsertest.cc +++ b/chrome/browser/metrics/metrics_service_browsertest.cc @@ -13,14 +13,15 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/metrics_service.h" +#include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/public/browser/notification_service.h" -#include "content/public/browser/notification_types.h" +#include "content/public/test/browser_test_utils.h" #include "net/base/net_util.h" #include "ui/base/window_open_disposition.h" #include "url/gurl.h" @@ -88,9 +89,9 @@ IN_PROC_BROWSER_TEST_F(MetricsServiceBrowserTest, MAYBE_CrashRenderers) { OpenTabs(); // Kill the process for one of the tabs. - content::WindowedNotificationObserver observer( - content::NOTIFICATION_RENDERER_PROCESS_CLOSED, - content::NotificationService::AllSources()); + content::RenderProcessHostWatcher observer( + browser()->tab_strip_model()->GetActiveWebContents(), + content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL)); observer.Wait(); |