Remove AppsNavigationThrottle duplicated includes

Adding forward declarations when needed so we can remove duplicated
includes. Removing unnecessary prefix for code already declared
inside the chromeos namespace.

Bug: None
Change-Id: If9e7d04fbb282ce9badbc08908490d7e8d634627
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1504392
Commit-Queue: David Jacobo <djacobo@chromium.org>
Auto-Submit: David Jacobo <djacobo@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#637941}

chrome/browser/chromeos/apps/intent_helper/apps_navigation_throttle.cc

@@ -26,7 +26,6 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/common/chrome_features.h"
-#include "chrome/services/app_service/public/mojom/types.mojom.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "components/arc/metrics/arc_metrics_constants.h"
 #include "content/public/browser/browser_context.h"
@@ -210,7 +209,7 @@ void AppsNavigationThrottle::OnIntentPickerClosed(
       // TODO(crbug.com/826982): This workaround can be removed when preferences
       // are no longer persisted within the ARC container, it was necessary
       // since chrome browser is neither a PWA or ARC app.
-      if (close_reason == chromeos::IntentPickerCloseReason::STAY_IN_CHROME &&
+      if (close_reason == IntentPickerCloseReason::STAY_IN_CHROME &&
           should_persist) {
         arc::ArcIntentPickerAppFetcher::MaybeLaunchOrPersistArcApp(
             url, launch_name, /*should_launch_app=*/false,
@@ -219,8 +218,7 @@ void AppsNavigationThrottle::OnIntentPickerClosed(
       // We reach here if the picker was closed without an app being chosen,
       // e.g. due to the tab being closed. Keep count of this scenario so we can
       // stop the UI from showing after 2+ dismissals.
-      if (close_reason ==
-          chromeos::IntentPickerCloseReason::DIALOG_DEACTIVATED) {
+      if (close_reason == IntentPickerCloseReason::DIALOG_DEACTIVATED) {
         if (ui_auto_display_service)
           ui_auto_display_service->IncrementCounter(url);
       }

chrome/browser/chromeos/apps/intent_helper/apps_navigation_throttle.h

@@ -13,7 +13,6 @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/apps/intent_helper/apps_navigation_types.h"
 #include "chrome/services/app_service/public/mojom/types.mojom.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "url/gurl.h"
@@ -27,6 +26,10 @@ class IntentPickerAutoDisplayService;
 
 namespace chromeos {
 
+enum class AppsNavigationAction;
+enum class IntentPickerCloseReason;
+struct IntentPickerAppInfo;
+
 // Allows navigation to be routed to an installed app on Chrome OS, and provides
 // a static method for showing an intent picker for the current URL to display
 // any handling apps.

chrome/browser/chromeos/apps/intent_helper/apps_navigation_throttle_unittest.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/apps/intent_helper/apps_navigation_throttle.h"
+#include "chrome/browser/chromeos/apps/intent_helper/apps_navigation_types.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"