[arc-intents] Handle redirects.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 2920 matching lines @@
     if (merge_session_throttling_utils::ShouldAttachNavigationThrottle() &&
         !merge_session_throttling_utils::AreAllSessionMergedAlready() &&
         handle->GetURL().SchemeIsHTTPOrHTTPS()) {
       throttles.push_back(MergeSessionNavigationThrottle::Create(handle));
     }
 
     // TODO(djacobo): Support incognito mode by showing an aditional dialog as a
     // 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));
       }
     }
   }
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
   if (!handle->IsInMainFrame())
     throttles.push_back(new extensions::ExtensionNavigationThrottle(handle));
 #endif
 
@@ skipping 81 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)