Remove 2-stage RenderWidget initialization

chrome/browser/apps/guest_view/web_view_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <queue>
 
 #include "base/location.h"
 #include "base/path_service.h"
 #include "base/process/process.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 2858 matching lines @@
   DCHECK(guest);
 
   return l10n_util::GetStringFUTF16(guest->GetTaskPrefix(), base::string16());
 }
 
 const std::vector<task_management::WebContentsTag*>& GetTrackedTags() {
   return task_management::WebContentsTagsManager::GetInstance()->
       tracked_tags();
 }
 
+bool HasExpectedGuestTask(
+    const task_management::MockWebContentsTaskManager& task_manager,
+    content::WebContents* guest_contents) {
+  bool found = false;
+  for (auto* task: task_manager.tasks()) {
+    if (task->GetType() != task_management::Task::GUEST)
+      continue;
+    EXPECT_FALSE(found);
+    found = true;
+    const base::string16 title = task->title();
+    const base::string16 expected_prefix = GetExpectedPrefix(guest_contents);
+    EXPECT_TRUE(base::StartsWith(title, expected_prefix,
+                                 base::CompareCase::INSENSITIVE_ASCII));
+  }
+  return found;
+}
+
 }  // namespace
 
 // Tests that the pre-existing WebViews are provided to the task manager.
 IN_PROC_BROWSER_TEST_F(WebViewTest, TaskManagementPreExistingWebViews) {
   ASSERT_TRUE(StartEmbeddedTestServer());
 
   // Browser tests start with a single tab.
   EXPECT_EQ(1U, GetTrackedTags().size());
 
   content::WebContents* guest_contents =
       LoadGuest("/extensions/platform_apps/web_view/task_manager/guest.html",
                 "web_view/task_manager");
 
   task_management::MockWebContentsTaskManager task_manager;
   task_manager.StartObserving();
 
   // The pre-existing tab and guest tasks are provided.
-  // 4 tasks expected in the following order:
+  // 4 tasks expected. The order is arbitrary.
   // 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());
-  const base::string16 title = task->title();
-  const base::string16 expected_prefix = GetExpectedPrefix(guest_contents);
-  EXPECT_TRUE(base::StartsWith(title,
-                               expected_prefix,
-                               base::CompareCase::INSENSITIVE_ASCII));
+  EXPECT_TRUE(HasExpectedGuestTask(task_manager, guest_contents));
 }
 
 // Tests that the post-existing WebViews are provided to the task manager.
 IN_PROC_BROWSER_TEST_F(WebViewTest, TaskManagementPostExistingWebViews) {
   ASSERT_TRUE(StartEmbeddedTestServer());
 
   // Browser tests start with a single tab.
   EXPECT_EQ(1U, GetTrackedTags().size());
 
   task_management::MockWebContentsTaskManager task_manager;
   task_manager.StartObserving();
 
   // Only the "about:blank" tab shows at the moment.
   EXPECT_EQ(1U, task_manager.tasks().size());
   const task_management::Task* about_blank_task = task_manager.tasks().back();
   EXPECT_EQ(task_management::Task::RENDERER, about_blank_task->GetType());
   EXPECT_EQ(base::UTF8ToUTF16("Tab: about:blank"), about_blank_task->title());
 
   // Now load a guest web view.
   content::WebContents* guest_contents =
       LoadGuest("/extensions/platform_apps/web_view/task_manager/guest.html",
                 "web_view/task_manager");
-  // 4 tasks expected in the following order:
+  // 4 tasks expected. The order is arbitrary.
   // 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());
-  const base::string16 title = task->title();
-  const base::string16 expected_prefix = GetExpectedPrefix(guest_contents);
-  EXPECT_TRUE(base::StartsWith(title,
-                               expected_prefix,
-                               base::CompareCase::INSENSITIVE_ASCII));
+  EXPECT_TRUE(HasExpectedGuestTask(task_manager, guest_contents));
 }
 
 #endif  // defined(ENABLE_TASK_MANAGER)