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

Unified Diff: chrome/browser/apps/guest_view/web_view_browsertest.cc

Issue 1254103002: New Task Manager - Phase 1.3.5: Implement Extension Task Providing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Devlin's comments Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/chrome_extensions_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/guest_view/web_view_browsertest.cc
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index c3e1c28d71c7a8465f19a8724b25ebb26ead69c7..ef825f36fef03a78acc1dfbbf9f07d11976fc1a5 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -2680,8 +2680,12 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, TaskManagementPreExistingWebViews) {
task_manager.StartObserving();
// The pre-existing tab and guest tasks are provided.
- // TODO(afakhry): This will have to change once we start tracking extensions.
- EXPECT_EQ(2U, task_manager.tasks().size());
+ // 4 tasks expected in the following order:
+ // Tab: about:blank,
+ // Background Page: <webview> task manager test,
+ // App: <webview> task manager test,
+ // Webview: WebViewed test content.
+ EXPECT_EQ(4U, task_manager.tasks().size());
const task_management::Task* task = task_manager.tasks().back();
EXPECT_EQ(task_management::Task::GUEST, task->GetType());
@@ -2712,8 +2716,12 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, TaskManagementPostExistingWebViews) {
content::WebContents* guest_contents =
LoadGuest("/extensions/platform_apps/web_view/task_manager/guest.html",
"web_view/task_manager");
- // TODO(afakhry): This will have to change once we start tracking extensions.
- EXPECT_EQ(2U, task_manager.tasks().size());
+ // 4 tasks expected in the following order:
+ // Tab: about:blank,
+ // Background Page: <webview> task manager test,
+ // App: <webview> task manager test,
+ // Webview: WebViewed test content.
+ EXPECT_EQ(4U, task_manager.tasks().size());
const task_management::Task* task = task_manager.tasks().back();
EXPECT_EQ(task_management::Task::GUEST, task->GetType());
« no previous file with comments | « no previous file | chrome/browser/extensions/chrome_extensions_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698