summaryrefslogtreecommitdiffstats
path: root/chrome/test/base/chrome_test_suite.cc
diff options
context:
space:
mode:
authormgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 10:30:31 +0000
committermgiuca@chromium.org <mgiuca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 10:30:31 +0000
commitf80bda00955c8455397408abc67dce4d75c90aa1 (patch)
tree13be2a0c60c14e70ed1b1c6f77d2255079ec7852 /chrome/test/base/chrome_test_suite.cc
parentb856972980c216bf2bb06366c8946cd97a2f2243 (diff)
downloadchromium_src-f80bda00955c8455397408abc67dce4d75c90aa1.zip
chromium_src-f80bda00955c8455397408abc67dce4d75c90aa1.tar.gz
chromium_src-f80bda00955c8455397408abc67dce4d75c90aa1.tar.bz2
Windows: Deleting a profile deletes all app shortcuts associated with it.
This will search all locations where app shortcuts reside and delete any that open Chrome with the profile being deleted. Mac and Linux have empty stubs, to be completed in a follow-up CL. BUG=236353 Review URL: https://chromiumcodereview.appspot.com/16139004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/chrome_test_suite.cc')
-rw-r--r--chrome/test/base/chrome_test_suite.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc
index d9fac00..bb25ee3 100644
--- a/chrome/test/base/chrome_test_suite.cc
+++ b/chrome/test/base/chrome_test_suite.cc
@@ -152,8 +152,10 @@ class ChromeTestSuiteInitializer : public testing::EmptyTestEventListener {
virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
if (g_browser_process) {
- delete g_browser_process;
+ BrowserProcess* browser_process = g_browser_process;
+ // g_browser_process must be NULL during its own destruction.
g_browser_process = NULL;
+ delete browser_process;
}
// TODO(ios): Bring this back once ChromeContentBrowserClient is building.