From 0605b8e8fde07fde1b2530bf56a39ef6ef4192f9 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Sat, 22 Dec 2012 16:55:25 +0000
Subject: [PATCH] Don't leak the V8 unit test setup into other tests.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@960 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 tests/unittests/v8_unittest.cc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/unittests/v8_unittest.cc b/tests/unittests/v8_unittest.cc
index a06582e0b..83e835f03 100644
--- a/tests/unittests/v8_unittest.cc
+++ b/tests/unittests/v8_unittest.cc
@@ -1662,6 +1662,9 @@ class V8RendererTest : public ClientApp::RenderDelegate {
                                 CefRefPtr<CefBrowser> browser,
                                 CefRefPtr<CefFrame> frame,
                                 CefRefPtr<CefV8Context> context) OVERRIDE {
+    if (test_mode_ == V8TEST_NONE)
+      return;
+
     if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) {
       if (browser_.get() == NULL) {
         app_ = app;
@@ -1742,6 +1745,9 @@ class V8RendererTest : public ClientApp::RenderDelegate {
                                  CefRefPtr<CefBrowser> browser,
                                  CefRefPtr<CefFrame> frame,
                                  CefRefPtr<CefV8Context> context) OVERRIDE {
+    if (test_mode_ == V8TEST_NONE)
+      return;
+
     if (test_mode_ == V8TEST_CONTEXT_INVALID &&
         frame->GetURL().ToString() != kV8NavTestUrl) {
       test_context_ =
@@ -1754,6 +1760,9 @@ class V8RendererTest : public ClientApp::RenderDelegate {
 
   virtual void OnBrowserDestroyed(CefRefPtr<ClientApp> app,
                                   CefRefPtr<CefBrowser> browser) OVERRIDE {
+    if (test_mode_ == V8TEST_NONE)
+      return;
+
     if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) {
       if (browser->IsPopup()) {
         // After window destruction there is still a call to
@@ -1770,6 +1779,9 @@ class V8RendererTest : public ClientApp::RenderDelegate {
                                         CefProcessId source_process,
                                         CefRefPtr<CefProcessMessage> message)
                                         OVERRIDE {
+    if (test_mode_ == V8TEST_NONE)
+      return false;
+
     if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) {
       EXPECT_TRUE(browser.get());
       EXPECT_EQ(PID_BROWSER, source_process);