diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-26 20:59:05 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-26 20:59:05 +0000 |
| commit | c1dffe83ba4c933b6e5a87edc92780eda101b2b4 (patch) | |
| tree | 869a9fedc1763f15ec6ed974c6c815050601d898 /chrome/browser/collected_cookies_browsertest.cc | |
| parent | 3a4ddfce956ad9e8f6a47ddee43e779c36443c88 (diff) | |
| download | chromium_src-c1dffe83ba4c933b6e5a87edc92780eda101b2b4.zip chromium_src-c1dffe83ba4c933b6e5a87edc92780eda101b2b4.tar.gz chromium_src-c1dffe83ba4c933b6e5a87edc92780eda101b2b4.tar.bz2 | |
GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1
This eliminates a whole class of problems with SpawnedTestServer
failing to start.
BUG=96594, 98194
R=asargent@chromium.org, rsleevi@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/16268017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/collected_cookies_browsertest.cc')
| -rw-r--r-- | chrome/browser/collected_cookies_browsertest.cc | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/chrome/browser/collected_cookies_browsertest.cc b/chrome/browser/collected_cookies_browsertest.cc index 539fcac..b26c17e 100644 --- a/chrome/browser/collected_cookies_browsertest.cc +++ b/chrome/browser/collected_cookies_browsertest.cc @@ -13,20 +13,13 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "net/test/spawned_test_server/spawned_test_server.h" - -namespace { - -const base::FilePath::CharType kDocRoot[] = - FILE_PATH_LITERAL("chrome/test/data"); - -} // namespace +#include "net/test/embedded_test_server/embedded_test_server.h" typedef InProcessBrowserTest CollectedCookiesTest; // If this crashes on Windows, use http://crbug.com/79331 IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, DoubleDisplay) { - ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); // Disable cookies. CookieSettings::Factory::GetForProfile(browser()->profile())-> @@ -34,7 +27,7 @@ IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, DoubleDisplay) { // Load a page with cookies. ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/cookie1.html")); + browser(), embedded_test_server()->GetURL("/cookie1.html")); // Click on the info link twice. content::WebContents* web_contents = @@ -52,7 +45,7 @@ IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, NavigateAway) { // Load a page with cookies. ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/cookie1.html")); + browser(), embedded_test_server()->GetURL("/cookie1.html")); // Click on the info link. content::WebContents* web_contents = @@ -61,5 +54,5 @@ IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, NavigateAway) { // Navigate to another page. ui_test_utils::NavigateToURL( - browser(), test_server()->GetURL("files/cookie2.html")); + browser(), embedded_test_server()->GetURL("/cookie2.html")); } |