Refactor of ExtensionNavigationThrottle

chrome/browser/ui/toolbar/toolbar_model_unittest.cc

Index: chrome/browser/ui/toolbar/toolbar_model_unittest.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
index 581c5070a23679530b2d0adad0a2d4c4857abd69..1d0864e0f5a92f0eacfe70e06ae8b5b503ebe7d4 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
@@ -21,6 +21,11 @@
 #include "content/public/common/url_constants.h"
 #include "ui/gfx/text_elider.h"
 
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+#include "extensions/browser/extension_registry.h"
+#include "extensions/common/test_util.h"
+#endif
+
 // Test data ------------------------------------------------------------------
 
 namespace {
@@ -29,34 +34,34 @@ struct TestItem {
   GURL url;
   base::string16 expected_text;
 } test_items[] = {
-  {
-    GURL("view-source:http://www.google.com"),
-    base::ASCIIToUTF16("view-source:www.google.com")
-  },
-  {
-    GURL("view-source:chrome://newtab/"),
-    base::ASCIIToUTF16("view-source:chrome://newtab")
-  },
-  {
-    GURL("chrome-extension://foo/bar.html"),
-    base::ASCIIToUTF16("chrome-extension://foo/bar.html")
-  },
-  {
-    GURL(url::kAboutBlankURL),
-    base::ASCIIToUTF16(url::kAboutBlankURL)
-  },
-  {
-    GURL("http://searchurl/?q=tractor+supply"),
-    base::ASCIIToUTF16("searchurl/?q=tractor+supply")
-  },
-  {
-    GURL("http://google.com/search?q=tractor+supply&espv=1"),
-    base::ASCIIToUTF16("google.com/search?q=tractor+supply&espv=1")
-  },
-  {
-    GURL("https://google.ca/search?q=tractor+supply"),
-    base::ASCIIToUTF16("https://google.ca/search?q=tractor+supply")
-  },
+    {
+        GURL("view-source:http://www.google.com"),
+        base::ASCIIToUTF16("view-source:www.google.com"),
+    },
+    {
+        GURL("view-source:chrome://newtab/"),
+        base::ASCIIToUTF16("view-source:chrome://newtab"),
+    },
+    {
+        GURL("chrome-extension://fooooooooooooooooooooooooooooooo/bar.html"),
+        base::ASCIIToUTF16(
+            "chrome-extension://fooooooooooooooooooooooooooooooo/bar.html"),
+    },
+    {
+        GURL(url::kAboutBlankURL), base::ASCIIToUTF16(url::kAboutBlankURL),
+    },
+    {
+        GURL("http://searchurl/?q=tractor+supply"),
+        base::ASCIIToUTF16("searchurl/?q=tractor+supply"),
+    },
+    {
+        GURL("http://google.com/search?q=tractor+supply&espv=1"),
+        base::ASCIIToUTF16("google.com/search?q=tractor+supply&espv=1"),
+    },
+    {
+        GURL("https://google.ca/search?q=tractor+supply"),
+        base::ASCIIToUTF16("https://google.ca/search?q=tractor+supply"),
+    },
 };
 
 }  // namespace
@@ -91,6 +96,14 @@ void ToolbarModelTest::SetUp() {
   BrowserWithTestWindowTest::SetUp();
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
       profile(), &AutocompleteClassifierFactory::BuildInstanceFor);
+
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+  // Install a fake extension so that the ID in the chrome-extension test URL is
+  // valid.

[Peter Kasting, 2017/05/17 23:13:59]

Nit: I would extend this comment to talk about why having a valid ID matters.

[ncarter (slow), 2017/05/22 21:14:29]

Done.

+  ASSERT_TRUE(extensions::ExtensionRegistry::Get(profile())->AddEnabled(
+      extensions::test_util::CreateEmptyExtension(
+          "fooooooooooooooooooooooooooooooo")));
+#endif
 }
 
 void ToolbarModelTest::NavigateAndCheckText(