diff options
| -rw-r--r-- | chrome/chrome_tests.gypi | 2 | ||||
| -rw-r--r-- | chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc (renamed from chrome/renderer/safe_browsing/phishing_dom_feature_extractor_unittest.cc) | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index d7f5e26..28ac169 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1230,7 +1230,6 @@ 'renderer/renderer_about_handler_unittest.cc', 'renderer/renderer_main_unittest.cc', 'renderer/safe_browsing/features_unittest.cc', - 'renderer/safe_browsing/phishing_dom_feature_extractor_unittest.cc', 'renderer/safe_browsing/phishing_url_feature_extractor_unittest.cc', 'renderer/spellchecker/spellcheck_unittest.cc', 'renderer/spellchecker/spellcheck_worditerator_unittest.cc', @@ -1644,6 +1643,7 @@ 'browser/task_manager_browsertest.cc', 'browser/views/browser_actions_container_browsertest.cc', 'renderer/form_autocomplete_browsertest.cc', + 'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc', 'test/automation/dom_automation_browsertest.cc', 'test/in_process_browser_test.cc', 'test/in_process_browser_test.h', diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_unittest.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc index c90af60..965d1b5 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_unittest.cc +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc @@ -1,6 +1,11 @@ // Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// +// Note that although this is not a "browser" test, it runs as part of +// browser_tests. This is because WebKit does not work properly if it is +// shutdown and re-initialized. Since browser_tests runs each test in a +// new process, this avoids the problem. #include "chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h" |