summaryrefslogtreecommitdiffstats
path: root/chrome/browser/collected_cookies_uitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/collected_cookies_uitest.cc')
-rw-r--r--chrome/browser/collected_cookies_uitest.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/collected_cookies_uitest.cc b/chrome/browser/collected_cookies_uitest.cc
index 169f072..6c241ce 100644
--- a/chrome/browser/collected_cookies_uitest.cc
+++ b/chrome/browser/collected_cookies_uitest.cc
@@ -4,7 +4,7 @@
#include <string>
-#include "chrome/app/chrome_dll_resource.h"
+#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
@@ -21,7 +21,8 @@ const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data");
typedef UITest CollectedCookiesTest;
-TEST_F(CollectedCookiesTest, DoubleDisplay) {
+// Flaky, http://crbug.com/62311.
+TEST_F(CollectedCookiesTest, FLAKY_DoubleDisplay) {
net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot));
ASSERT_TRUE(test_server.Start());
@@ -43,7 +44,8 @@ TEST_F(CollectedCookiesTest, DoubleDisplay) {
ASSERT_TRUE(tab->ShowCollectedCookiesDialog());
}
-TEST_F(CollectedCookiesTest, NavigateAway) {
+// Flaky, http://crbug.com/62311.
+TEST_F(CollectedCookiesTest, FLAKY_NavigateAway) {
net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot));
ASSERT_TRUE(test_server.Start());