Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Side by Side Diff: chrome/browser/ui/webui/net_internals_ui_browsertest.cc

Issue 8416059: Roll webkit 98723:98752. Disable NetInternalsDnsView tests for real. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/bind_helpers.h" 6 #include "base/bind_helpers.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 // TODO(mmenke): Add some checks for the import view. 267 // TODO(mmenke): Add some checks for the import view.
268 // TODO(mmenke): Add a test for a log created with --log-net-log. 268 // TODO(mmenke): Add a test for a log created with --log-net-log.
269 IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsExportImportDump) { 269 IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsExportImportDump) {
270 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsExportImportDump")); 270 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsExportImportDump"));
271 } 271 }
272 272
273 //////////////////////////////////////////////////////////////////////////////// 273 ////////////////////////////////////////////////////////////////////////////////
274 // dns_view.js 274 // dns_view.js
275 //////////////////////////////////////////////////////////////////////////////// 275 ////////////////////////////////////////////////////////////////////////////////
276 276
277 // TODO http://crbug.com/102227. These tests timeout around webkit r98738.
278
277 // Adds a successful lookup to the DNS cache, then clears the cache. 279 // Adds a successful lookup to the DNS cache, then clears the cache.
278 IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewSuccess) { 280 IN_PROC_BROWSER_TEST_F(NetInternalsTest, DISABLE_NetInternalsDnsViewSuccess) {
279 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewSuccess")); 281 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewSuccess"));
280 } 282 }
281 283
282 // Adds a failed lookup to the DNS cache, then clears the cache. 284 // Adds a failed lookup to the DNS cache, then clears the cache.
283 IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewFail) { 285 IN_PROC_BROWSER_TEST_F(NetInternalsTest, DISABLE_NetInternalsDnsViewFail) {
284 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewFail")); 286 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewFail"));
285 } 287 }
286 288
287 // Adds an expired successful lookup to the DNS cache, then clears the cache. 289 // Adds an expired successful lookup to the DNS cache, then clears the cache.
288 IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewExpired) { 290 IN_PROC_BROWSER_TEST_F(NetInternalsTest, DISABLE_NetInternalsDnsViewExpired) {
289 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewExpired")); 291 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewExpired"));
290 } 292 }
291 293
292 // Adds two entries to the DNS cache, clears the cache, and then repeats. 294 // Adds two entries to the DNS cache, clears the cache, and then repeats.
293 IN_PROC_BROWSER_TEST_F(NetInternalsTest, NetInternalsDnsViewAddTwoTwice) { 295 IN_PROC_BROWSER_TEST_F(NetInternalsTest, DISABLE_NetInternalsDnsViewAddTwoTwice) {
294 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewAddTwoTwice")); 296 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsDnsViewAddTwoTwice"));
295 } 297 }
296 298
297 //////////////////////////////////////////////////////////////////////////////// 299 ////////////////////////////////////////////////////////////////////////////////
298 // test_view.js 300 // test_view.js
299 //////////////////////////////////////////////////////////////////////////////// 301 ////////////////////////////////////////////////////////////////////////////////
300 302
301 // Runs the test suite twice, expecting a passing result the first time. Checks 303 // Runs the test suite twice, expecting a passing result the first time. Checks
302 // the first result, the order of events that occur, and the number of rows in 304 // the first result, the order of events that occur, and the number of rows in
303 // the table. 305 // the table.
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 // log_view_painter.js 418 // log_view_painter.js
417 //////////////////////////////////////////////////////////////////////////////// 419 ////////////////////////////////////////////////////////////////////////////////
418 420
419 // Check that we correctly remove cookies and login information. 421 // Check that we correctly remove cookies and login information.
420 IN_PROC_BROWSER_TEST_F(NetInternalsTest, 422 IN_PROC_BROWSER_TEST_F(NetInternalsTest,
421 NetInternalsLogViewPainterStripInfo) { 423 NetInternalsLogViewPainterStripInfo) {
422 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsLogViewPainterStripInfo")); 424 EXPECT_TRUE(RunJavascriptAsyncTest("netInternalsLogViewPainterStripInfo"));
423 } 425 }
424 426
425 } // namespace 427 } // namespace
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698