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

Side by Side Diff: chrome/browser/task_manager/task_manager_browsertest.cc

Issue 108213012: [DevTools] Remove dock side knowledge from browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac tests Created 6 years, 11 months 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/task_manager/task_manager.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 ASSERT_TRUE(model()->GetV8Memory(resource_index, &result)); 506 ASSERT_TRUE(model()->GetV8Memory(resource_index, &result));
507 LOG(INFO) << "Got V8 Heap Size " << result << " bytes"; 507 LOG(INFO) << "Got V8 Heap Size " << result << " bytes";
508 EXPECT_GE(result, minimal_heap_size); 508 EXPECT_GE(result, minimal_heap_size);
509 509
510 ASSERT_TRUE(model()->GetV8MemoryUsed(resource_index, &result)); 510 ASSERT_TRUE(model()->GetV8MemoryUsed(resource_index, &result));
511 LOG(INFO) << "Got V8 Used Heap Size " << result << " bytes"; 511 LOG(INFO) << "Got V8 Used Heap Size " << result << " bytes";
512 EXPECT_GE(result, minimal_heap_size); 512 EXPECT_GE(result, minimal_heap_size);
513 } 513 }
514 514
515 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeInTabDevToolsWindow) { 515 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeInTabDevToolsWindow) {
516 DevToolsWindow* dev_tools = DevToolsWindow::ToggleDevToolsWindow( 516 DevToolsWindow::OpenDevToolsWindowForTest(
517 model()->GetResourceWebContents(1)->GetRenderViewHost(), 517 model()->GetResourceWebContents(1)->GetRenderViewHost(), true);
518 true,
519 DevToolsToggleAction::Inspect());
520 // Dock side bottom should be the default.
521 ASSERT_EQ(DEVTOOLS_DOCK_SIDE_BOTTOM, dev_tools->dock_side());
522 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); 518 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
523 } 519 }
524 520
525 // This test differs from TaskManagerBrowserTest.NoticeInTabDevToolsWindow in 521 // This test differs from TaskManagerBrowserTest.NoticeInTabDevToolsWindow in
526 // the order in which the devtools window and task manager are created. 522 // the order in which the devtools window and task manager are created.
527 IN_PROC_BROWSER_TEST_F(TaskManagerNoShowBrowserTest, 523 IN_PROC_BROWSER_TEST_F(TaskManagerNoShowBrowserTest,
528 NoticeInTabDevToolsWindow) { 524 NoticeInTabDevToolsWindow) {
529 // First create the devtools window. 525 // First create the devtools window.
530 DevToolsWindow* dev_tools = DevToolsWindow::ToggleDevToolsWindow( 526 DevToolsWindow::OpenDevToolsWindowForTest(
531 browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), 527 browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
532 true, 528 true);
533 DevToolsToggleAction::Inspect());
534 // Dock side bottom should be the default.
535 ASSERT_EQ(DEVTOOLS_DOCK_SIDE_BOTTOM, dev_tools->dock_side());
536 // Make sure that the devtools window is loaded before starting the task 529 // Make sure that the devtools window is loaded before starting the task
537 // manager. 530 // manager.
538 content::RunAllPendingInMessageLoop(); 531 content::RunAllPendingInMessageLoop();
539 532
540 // Now add showing the task manager to the queue, and watch for the right 533 // Now add showing the task manager to the queue, and watch for the right
541 // number of reources to show up. 534 // number of reources to show up.
542 base::MessageLoop::current()->PostTask( 535 base::MessageLoop::current()->PostTask(
543 FROM_HERE, 536 FROM_HERE,
544 base::Bind(&TaskManagerNoShowBrowserTest::ShowTaskManager, 537 base::Bind(&TaskManagerNoShowBrowserTest::ShowTaskManager,
545 base::Unretained(this))); 538 base::Unretained(this)));
546 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); 539 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
547 } 540 }
548 541
549 #endif 542 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698