diff options
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 20 | ||||
-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. |