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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/chrome_extensions_browser_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <queue> 5 #include <queue>
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/process/process.h" 9 #include "base/process/process.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 2662 matching lines...) Expand 10 before | Expand all | Expand 10 after
2673 EXPECT_EQ(1U, GetTrackedTags().size()); 2673 EXPECT_EQ(1U, GetTrackedTags().size());
2674 2674
2675 content::WebContents* guest_contents = 2675 content::WebContents* guest_contents =
2676 LoadGuest("/extensions/platform_apps/web_view/task_manager/guest.html", 2676 LoadGuest("/extensions/platform_apps/web_view/task_manager/guest.html",
2677 "web_view/task_manager"); 2677 "web_view/task_manager");
2678 2678
2679 task_management::MockWebContentsTaskManager task_manager; 2679 task_management::MockWebContentsTaskManager task_manager;
2680 task_manager.StartObserving(); 2680 task_manager.StartObserving();
2681 2681
2682 // The pre-existing tab and guest tasks are provided. 2682 // The pre-existing tab and guest tasks are provided.
2683 // TODO(afakhry): This will have to change once we start tracking extensions. 2683 // 4 tasks expected in the following order:
2684 EXPECT_EQ(2U, task_manager.tasks().size()); 2684 // Tab: about:blank,
2685 // Background Page: <webview> task manager test,
2686 // App: <webview> task manager test,
2687 // Webview: WebViewed test content.
2688 EXPECT_EQ(4U, task_manager.tasks().size());
2685 2689
2686 const task_management::Task* task = task_manager.tasks().back(); 2690 const task_management::Task* task = task_manager.tasks().back();
2687 EXPECT_EQ(task_management::Task::GUEST, task->GetType()); 2691 EXPECT_EQ(task_management::Task::GUEST, task->GetType());
2688 const base::string16 title = task->title(); 2692 const base::string16 title = task->title();
2689 const base::string16 expected_prefix = GetExpectedPrefix(guest_contents); 2693 const base::string16 expected_prefix = GetExpectedPrefix(guest_contents);
2690 EXPECT_TRUE(base::StartsWith(title, 2694 EXPECT_TRUE(base::StartsWith(title,
2691 expected_prefix, 2695 expected_prefix,
2692 base::CompareCase::INSENSITIVE_ASCII)); 2696 base::CompareCase::INSENSITIVE_ASCII));
2693 } 2697 }
2694 2698
(...skipping 10 matching lines...) Expand all
2705 // Only the "about:blank" tab shows at the moment. 2709 // Only the "about:blank" tab shows at the moment.
2706 EXPECT_EQ(1U, task_manager.tasks().size()); 2710 EXPECT_EQ(1U, task_manager.tasks().size());
2707 const task_management::Task* about_blank_task = task_manager.tasks().back(); 2711 const task_management::Task* about_blank_task = task_manager.tasks().back();
2708 EXPECT_EQ(task_management::Task::RENDERER, about_blank_task->GetType()); 2712 EXPECT_EQ(task_management::Task::RENDERER, about_blank_task->GetType());
2709 EXPECT_EQ(base::UTF8ToUTF16("Tab: about:blank"), about_blank_task->title()); 2713 EXPECT_EQ(base::UTF8ToUTF16("Tab: about:blank"), about_blank_task->title());
2710 2714
2711 // Now load a guest web view. 2715 // Now load a guest web view.
2712 content::WebContents* guest_contents = 2716 content::WebContents* guest_contents =
2713 LoadGuest("/extensions/platform_apps/web_view/task_manager/guest.html", 2717 LoadGuest("/extensions/platform_apps/web_view/task_manager/guest.html",
2714 "web_view/task_manager"); 2718 "web_view/task_manager");
2715 // TODO(afakhry): This will have to change once we start tracking extensions. 2719 // 4 tasks expected in the following order:
2716 EXPECT_EQ(2U, task_manager.tasks().size()); 2720 // Tab: about:blank,
2721 // Background Page: <webview> task manager test,
2722 // App: <webview> task manager test,
2723 // Webview: WebViewed test content.
2724 EXPECT_EQ(4U, task_manager.tasks().size());
2717 2725
2718 const task_management::Task* task = task_manager.tasks().back(); 2726 const task_management::Task* task = task_manager.tasks().back();
2719 EXPECT_EQ(task_management::Task::GUEST, task->GetType()); 2727 EXPECT_EQ(task_management::Task::GUEST, task->GetType());
2720 const base::string16 title = task->title(); 2728 const base::string16 title = task->title();
2721 const base::string16 expected_prefix = GetExpectedPrefix(guest_contents); 2729 const base::string16 expected_prefix = GetExpectedPrefix(guest_contents);
2722 EXPECT_TRUE(base::StartsWith(title, 2730 EXPECT_TRUE(base::StartsWith(title,
2723 expected_prefix, 2731 expected_prefix,
2724 base::CompareCase::INSENSITIVE_ASCII)); 2732 base::CompareCase::INSENSITIVE_ASCII));
2725 } 2733 }
2726 2734
2727 #endif // defined(ENABLE_TASK_MANAGER) 2735 #endif // defined(ENABLE_TASK_MANAGER)
OLDNEW
« 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