Add WebView PlzNavigate related fixes to extensions_browsertests harness.

extensions/shell/browser/shell_navigation_ui_data.h

Index: extensions/shell/browser/shell_navigation_ui_data.h
diff --git a/chrome/browser/renderer_host/chrome_navigation_ui_data.h b/extensions/shell/browser/shell_navigation_ui_data.h
similarity index 56%
copy from chrome/browser/renderer_host/chrome_navigation_ui_data.h
copy to extensions/shell/browser/shell_navigation_ui_data.h
index 4f441e03d44b5bad4dd9de7362ced0fec9a6a27c..098695b33a6af4fcdb3b84c01d4a6daec69d772f 100644
--- a/chrome/browser/renderer_host/chrome_navigation_ui_data.h
+++ b/extensions/shell/browser/shell_navigation_ui_data.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_RENDERER_HOST_CHROME_NAVIGATION_UI_DATA_H_
-#define CHROME_BROWSER_RENDERER_HOST_CHROME_NAVIGATION_UI_DATA_H_
+#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_NAVIGATION_UI_DATA_H_
+#define EXTENSIONS_SHELL_BROWSER_SHELL_NAVIGATION_UI_DATA_H_
 
 #include <memory>
 
@@ -11,42 +11,38 @@
 #include "content/public/browser/navigation_ui_data.h"
 #include "extensions/browser/extension_navigation_ui_data.h"
 
-namespace content {
-class NavigationHandle;
-}
+namespace extensions {
 
 // PlzNavigate
 // Contains data that is passed from the UI thread to the IO thread at the
 // beginning of each navigation. The class is instantiated on the UI thread,
 // then a copy created using Clone is passed to the content::ResourceRequestInfo
 // on the IO thread.
-class ChromeNavigationUIData : public content::NavigationUIData {
+class ShellNavigationUIData : public content::NavigationUIData {
  public:
-  ChromeNavigationUIData();
-  explicit ChromeNavigationUIData(content::NavigationHandle* navigation_handle);
-  ~ChromeNavigationUIData() override;
+  ShellNavigationUIData();
+  explicit ShellNavigationUIData(content::NavigationHandle* navigation_handle);
+  ~ShellNavigationUIData() override;
 
   // Creates a new ChromeNavigationUIData that is a deep copy of the original.
   // Any changes to the original after the clone is created will not be
   // reflected in the clone.  |extension_data_| is deep copied.
   std::unique_ptr<content::NavigationUIData> Clone() const override;
 
-#if defined(ENABLE_EXTENSIONS)
   void SetExtensionNavigationUIData(
-      std::unique_ptr<extensions::ExtensionNavigationUIData> extension_data);
+      std::unique_ptr<ExtensionNavigationUIData> extension_data);
 
-  extensions::ExtensionNavigationUIData* GetExtensionNavigationUIData() const {
+  ExtensionNavigationUIData* GetExtensionNavigationUIData() const {
     return extension_data_.get();
   }
-#endif
 
  private:
-#if defined(ENABLE_EXTENSIONS)
   // Manages the lifetime of optional ExtensionNavigationUIData information.
-  std::unique_ptr<extensions::ExtensionNavigationUIData> extension_data_;
-#endif
+  std::unique_ptr<ExtensionNavigationUIData> extension_data_;
 
-  DISALLOW_COPY_AND_ASSIGN(ChromeNavigationUIData);
+  DISALLOW_COPY_AND_ASSIGN(ShellNavigationUIData);
 };
 
-#endif  // CHROME_BROWSER_RENDERER_HOST_CHROME_NAVIGATION_UI_DATA_H_
+}  // namespace extensions
+
+#endif  // EXTENSIONS_SHELL_BROWSER_SHELL_NAVIGATION_UI_DATA_H_