| Index: content/browser/site_per_process_browsertest.cc
|
| diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
|
| index 505f93a075f60345c8a31c9909d983d08040ea5d..8fc8598e1ec118f8755046d6d85fc48f9ba02bef 100644
|
| --- a/content/browser/site_per_process_browsertest.cc
|
| +++ b/content/browser/site_per_process_browsertest.cc
|
| @@ -7238,12 +7238,12 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| filter2->Wait();
|
|
|
| // At this point, we should have two pending WebContents.
|
| - EXPECT_TRUE(
|
| - ContainsKey(web_contents()->pending_contents_,
|
| - std::make_pair(process1->GetID(), filter1->routing_id())));
|
| - EXPECT_TRUE(
|
| - ContainsKey(web_contents()->pending_contents_,
|
| - std::make_pair(process2->GetID(), filter2->routing_id())));
|
| + EXPECT_TRUE(base::ContainsKey(
|
| + web_contents()->pending_contents_,
|
| + std::make_pair(process1->GetID(), filter1->routing_id())));
|
| + EXPECT_TRUE(base::ContainsKey(
|
| + web_contents()->pending_contents_,
|
| + std::make_pair(process2->GetID(), filter2->routing_id())));
|
|
|
| // Both subframes were set up in the same way, so the next routing ID for the
|
| // new popup windows should match up (this led to the collision in the
|
| @@ -7314,12 +7314,12 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| filter2->Wait();
|
|
|
| // At this point, we should have two pending widgets.
|
| - EXPECT_TRUE(
|
| - ContainsKey(web_contents()->pending_widget_views_,
|
| - std::make_pair(process1->GetID(), filter1->routing_id())));
|
| - EXPECT_TRUE(
|
| - ContainsKey(web_contents()->pending_widget_views_,
|
| - std::make_pair(process2->GetID(), filter2->routing_id())));
|
| + EXPECT_TRUE(base::ContainsKey(
|
| + web_contents()->pending_widget_views_,
|
| + std::make_pair(process1->GetID(), filter1->routing_id())));
|
| + EXPECT_TRUE(base::ContainsKey(
|
| + web_contents()->pending_widget_views_,
|
| + std::make_pair(process2->GetID(), filter2->routing_id())));
|
|
|
| // Both subframes were set up in the same way, so the next routing ID for the
|
| // new popup widgets should match up (this led to the collision in the
|
| @@ -7331,12 +7331,12 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
|
| false, gfx::Rect());
|
| web_contents()->ShowCreatedWidget(process2->GetID(), filter2->routing_id(),
|
| false, gfx::Rect());
|
| - EXPECT_FALSE(
|
| - ContainsKey(web_contents()->pending_widget_views_,
|
| - std::make_pair(process1->GetID(), filter1->routing_id())));
|
| - EXPECT_FALSE(
|
| - ContainsKey(web_contents()->pending_widget_views_,
|
| - std::make_pair(process2->GetID(), filter2->routing_id())));
|
| + EXPECT_FALSE(base::ContainsKey(
|
| + web_contents()->pending_widget_views_,
|
| + std::make_pair(process1->GetID(), filter1->routing_id())));
|
| + EXPECT_FALSE(base::ContainsKey(
|
| + web_contents()->pending_widget_views_,
|
| + std::make_pair(process2->GetID(), filter2->routing_id())));
|
| }
|
| #endif
|
|
|
|
|