[arc-intents] Handle redirects.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 42bc2808851dec99ca436fd4b56be33d22838050..3d1de5d90b2c4430d5d4fbdc7d389ade486656ec 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2938,22 +2938,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
     // warning that the selected app is not in incognito mode.
     if (IsIntentPickerEnabled() &&
         !handle->GetWebContents()->GetBrowserContext()->IsOffTheRecord()) {
-      arc::ArcServiceManager* arc_service_manager =
-          arc::ArcServiceManager::Get();
-      DCHECK(arc_service_manager);
-      scoped_refptr<arc::LocalActivityResolver> local_resolver =

[djacobo_, 2016/07/28 20:08:01]

If we are not using the local_resolver in here, remove the
local_activity_resolver.h from the includes

[Ben Kwa, 2016/07/28 21:33:12]

Done.

-          arc_service_manager->activity_resolver();
-      if (!local_resolver->ShouldChromeHandleUrl(handle->GetURL())) {
-        prerender::PrerenderContents* prerender_contents =
-            prerender::PrerenderContents::FromWebContents(
-                handle->GetWebContents());
-        if (!prerender_contents) {
-          auto intent_picker_cb = base::Bind(ShowIntentPickerBubble());
-          auto url_to_arc_throttle =
-              base::MakeUnique<arc::ArcNavigationThrottle>(handle,
-                                                           intent_picker_cb);
-          throttles.push_back(std::move(url_to_arc_throttle));
-        }
+      prerender::PrerenderContents* prerender_contents =
+          prerender::PrerenderContents::FromWebContents(
+              handle->GetWebContents());
+      if (!prerender_contents) {
+        auto intent_picker_cb = base::Bind(ShowIntentPickerBubble());
+        auto url_to_arc_throttle = base::MakeUnique<arc::ArcNavigationThrottle>(
+            handle, intent_picker_cb);
+        throttles.push_back(std::move(url_to_arc_throttle));
       }
     }
   }