summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-28 17:17:10 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-28 17:17:10 +0000
commit76fdc21de47ba710cd71f1d06ca55362b118c390 (patch)
treed9ec9563c0229fbce61def9bb34b24bf713c11a5 /chrome/browser
parente19516d9748c6bfc5798880dc0bbe03374d722c4 (diff)
downloadchromium_src-76fdc21de47ba710cd71f1d06ca55362b118c390.zip
chromium_src-76fdc21de47ba710cd71f1d06ca55362b118c390.tar.gz
chromium_src-76fdc21de47ba710cd71f1d06ca55362b118c390.tar.bz2
Relanding this:
This patch adds a new kind of tests: browser tests. They are intended to provide an alternative to the UI tests, hopefully helping with flackiness. These tests are in-process browser test. There are 2 projects to build the tests: - the browser_test.dll that contains the tests, the gtest framework and the browser classes. - the browser_test_launcher.exe. The launcher loads the browser_test.dll for each test, run the test and then unloads the DLL. This insures the static initializers are run before each test and that any atexit handler is invoked properly. This is Windows only for now. BUG=9764 TEST=Run browser_test.exe TBR=maruel Review URL: http://codereview.chromium.org/99097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/ssl/ssl_browser_tests.cc20
-rw-r--r--chrome/browser/views/find_bar_win_browsertest.cc (renamed from chrome/browser/views/find_bar_win_unittest.cc)6
2 files changed, 22 insertions, 4 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
new file mode 100644
index 0000000..c2a49c4
--- /dev/null
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -0,0 +1,20 @@
+// Copyright (c) 2009 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.
+
+#include "net/base/ssl_test_util.h"
+
+#include "chrome/test/in_process_browser_test.h"
+
+namespace {
+
+const wchar_t* const kDocRoot = L"chrome/test/data";
+
+class SSLBrowserTest : public InProcessBrowserTest {
+};
+
+} // namespace
+
+// TODO(jcampan): port SSLUITest to SSLBrowserTest.
+IN_PROC_BROWSER_TEST_F(SSLBrowserTest, TestHTTP) {
+}
diff --git a/chrome/browser/views/find_bar_win_unittest.cc b/chrome/browser/views/find_bar_win_browsertest.cc
index 2d50ff2..4cca160 100644
--- a/chrome/browser/views/find_bar_win_unittest.cc
+++ b/chrome/browser/views/find_bar_win_browsertest.cc
@@ -7,8 +7,8 @@
#include "chrome/browser/find_notification_details.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/tab_contents/web_contents.h"
#include "chrome/browser/tab_contents/tab_contents_view.h"
+#include "chrome/browser/tab_contents/web_contents.h"
#include "chrome/browser/views/find_bar_win.h"
#include "chrome/common/notification_service.h"
#include "chrome/test/in_process_browser_test.h"
@@ -159,9 +159,7 @@ std::string FocusedOnPage(WebContents* web_contents) {
// This tests the FindInPage end-state, in other words: what is focused when you
// close the Find box (ie. if you find within a link the link should be
// focused).
-// TODO(jcampan): This test needs to be enabled once Jay fixes the issues with
-// running two InProc browser tests that both start a web server (crashes).
-IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, DISABLED_FindInPageEndState) {
+IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageEndState) {
HTTPTestServer* server = StartHTTPServer();
// First we navigate to our special focus tracking page.