Add test renderer host support to ExtensionServiceTestBase.

chrome/browser/extensions/api/tabs/tabs_api_unittest.cc

 // Copyright 2016 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 "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "content/public/browser/navigation_entry.h"
-#include "content/public/test/test_web_contents_factory.h"
 #include "content/public/test/web_contents_tester.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/test_util.h"
 
 namespace extensions {
 
 namespace {
 
 std::unique_ptr<base::ListValue> RunTabsQueryFunction(
     Browser* browser,
@@ skipping 46 matching lines @@
   ExtensionServiceTestBase::TearDown();
 }
 
 TEST_F(TabsApiUnitTest, QueryWithoutTabsPermission) {
   GURL tab_urls[] = {GURL("http://www.google.com"),
                      GURL("http://www.example.com"),
                      GURL("https://www.google.com")};
   std::string tab_titles[] = {"", "Sample title", "Sample title"};
 
   // Add 3 web contentses to the browser.
-  content::TestWebContentsFactory factory;
-  content::WebContents* web_contentses[arraysize(tab_urls)];
+  std::unique_ptr<content::WebContents> web_contentses[arraysize(tab_urls)];
   for (size_t i = 0; i < arraysize(tab_urls); ++i) {
-    content::WebContents* web_contents = factory.CreateWebContents(profile());
-    web_contentses[i] = web_contents;
+    content::WebContents* web_contents =
+        content::WebContentsTester::CreateTestWebContents(profile(), nullptr);
+    web_contentses[i].reset(web_contents);
     browser()->tab_strip_model()->AppendWebContents(web_contents, true);
     EXPECT_EQ(browser()->tab_strip_model()->GetActiveWebContents(),
               web_contents);
     content::WebContentsTester* web_contents_tester =
         content::WebContentsTester::For(web_contents);
     web_contents_tester->NavigateAndCommit(tab_urls[i]);
     web_contents->GetController().GetVisibleEntry()->SetTitle(
         base::ASCIIToUTF16(tab_titles[i]));
   }
 
@@ skipping 21 matching lines @@
   std::unique_ptr<base::ListValue> tabs_list_with_permission(
       RunTabsQueryFunction(browser(), extension_with_permission.get(),
                            kTitleAndURLQueryInfo));
   ASSERT_TRUE(tabs_list_with_permission);
   ASSERT_EQ(1u, tabs_list_with_permission->GetSize());
 
   const base::DictionaryValue* third_tab_info;
   ASSERT_TRUE(tabs_list_with_permission->GetDictionary(0, &third_tab_info));
   int third_tab_id = -1;
   ASSERT_TRUE(third_tab_info->GetInteger("id", &third_tab_id));
-  EXPECT_EQ(ExtensionTabUtil::GetTabId(web_contentses[2]), third_tab_id);
+  EXPECT_EQ(ExtensionTabUtil::GetTabId(web_contentses[2].get()), third_tab_id);
 }
 
 TEST_F(TabsApiUnitTest, QueryWithHostPermission) {
   GURL tab_urls[] = {GURL("http://www.google.com"),
                      GURL("http://www.example.com"),
                      GURL("https://www.google.com/test")};
   std::string tab_titles[] = {"", "Sample title", "Sample title"};
 
   // Add 3 web contentses to the browser.
-  content::TestWebContentsFactory factory;
-  content::WebContents* web_contentses[arraysize(tab_urls)];
+  std::unique_ptr<content::WebContents> web_contentses[arraysize(tab_urls)];
   for (size_t i = 0; i < arraysize(tab_urls); ++i) {
-    content::WebContents* web_contents = factory.CreateWebContents(profile());
-    web_contentses[i] = web_contents;
+    content::WebContents* web_contents =
+        content::WebContentsTester::CreateTestWebContents(profile(), nullptr);
+    web_contentses[i].reset(web_contents);
     browser()->tab_strip_model()->AppendWebContents(web_contents, true);
     EXPECT_EQ(browser()->tab_strip_model()->GetActiveWebContents(),
               web_contents);
     content::WebContentsTester* web_contents_tester =
         content::WebContentsTester::For(web_contents);
     web_contents_tester->NavigateAndCommit(tab_urls[i]);
     web_contents->GetController().GetVisibleEntry()->SetTitle(
         base::ASCIIToUTF16(tab_titles[i]));
   }
 
@@ skipping 17 matching lines @@
     std::unique_ptr<base::ListValue> tabs_list_with_permission(
         RunTabsQueryFunction(browser(), extension_with_permission.get(),
                              kTitleAndURLQueryInfo));
     ASSERT_TRUE(tabs_list_with_permission);
     ASSERT_EQ(1u, tabs_list_with_permission->GetSize());
 
     const base::DictionaryValue* third_tab_info;
     ASSERT_TRUE(tabs_list_with_permission->GetDictionary(0, &third_tab_info));
     int third_tab_id = -1;
     ASSERT_TRUE(third_tab_info->GetInteger("id", &third_tab_id));
-    EXPECT_EQ(ExtensionTabUtil::GetTabId(web_contentses[2]), third_tab_id);
+    EXPECT_EQ(ExtensionTabUtil::GetTabId(web_contentses[2].get()),
+              third_tab_id);
   }
 
   // Try the same without title, first and third tabs will match.
   const char* kURLQueryInfo = "[{\"url\": \"*://www.google.com/*\"}]";
   {
     std::unique_ptr<base::ListValue> tabs_list_with_permission(
         RunTabsQueryFunction(browser(), extension_with_permission.get(),
                              kURLQueryInfo));
     ASSERT_TRUE(tabs_list_with_permission);
     ASSERT_EQ(2u, tabs_list_with_permission->GetSize());
 
     const base::DictionaryValue* first_tab_info;
     const base::DictionaryValue* third_tab_info;
     ASSERT_TRUE(tabs_list_with_permission->GetDictionary(0, &first_tab_info));
     ASSERT_TRUE(tabs_list_with_permission->GetDictionary(1, &third_tab_info));
 
     std::vector<int> expected_tabs_ids;
-    expected_tabs_ids.push_back(ExtensionTabUtil::GetTabId(web_contentses[0]));
-    expected_tabs_ids.push_back(ExtensionTabUtil::GetTabId(web_contentses[2]));
+    expected_tabs_ids.push_back(
+        ExtensionTabUtil::GetTabId(web_contentses[0].get()));
+    expected_tabs_ids.push_back(
+        ExtensionTabUtil::GetTabId(web_contentses[2].get()));
 
     int first_tab_id = -1;
     ASSERT_TRUE(first_tab_info->GetInteger("id", &first_tab_id));
     EXPECT_TRUE(ContainsValue(expected_tabs_ids, first_tab_id));
 
     int third_tab_id = -1;
     ASSERT_TRUE(third_tab_info->GetInteger("id", &third_tab_id));
     EXPECT_TRUE(ContainsValue(expected_tabs_ids, third_tab_id));
   }
 }
 
 }  // namespace extensions