Register application connections under their post-redirect URL.

shell/application_manager/network_fetcher.cc

 // Copyright 2015 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 "shell/application_manager/network_fetcher.h"
 
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 19 matching lines @@
     : Fetcher(loader_callback),
       disable_cache_(false),
       url_(url),
       weak_ptr_factory_(this) {
   StartNetworkRequest(url, network_service);
 }
 
 NetworkFetcher::~NetworkFetcher() {
 }
 
+const GURL& NetworkFetcher::GetURL() const {
+  return url_;
+}
+
+GURL NetworkFetcher::GetRedirectURL() const {
+  if (!response_)
+    return GURL::EmptyGURL();
+
+  if (response_->redirect_url.is_null())
+    return GURL::EmptyGURL();
+
+  return GURL(response_->redirect_url);
+}
+
 URLResponsePtr NetworkFetcher::AsURLResponse(base::TaskRunner* task_runner,
                                              uint32_t skip) {
   if (skip != 0) {
     MojoResult result = ReadDataRaw(
         response_->body.get(), nullptr, &skip,
         MOJO_READ_DATA_FLAG_ALL_OR_NONE | MOJO_READ_DATA_FLAG_DISCARD);
     DCHECK_EQ(result, MOJO_RESULT_OK);
   }
   return response_.Pass();
 }
@@ skipping 110 matching lines @@
 
 bool NetworkFetcher::PeekFirstLine(std::string* line) {
   return shell::BlockingPeekLine(response_->body.get(), line, kMaxShebangLength,
                                  kPeekTimeout);
 }
 
 void NetworkFetcher::StartNetworkRequest(const GURL& url,
                                          NetworkService* network_service) {
   URLRequestPtr request(URLRequest::New());
   request->url = String::From(url);
-  request->auto_follow_redirects = true;
+  request->auto_follow_redirects = false;
   request->bypass_cache = disable_cache_;
 
   network_service->CreateURLLoader(GetProxy(&url_loader_));
   url_loader_->Start(request.Pass(),
                      base::Bind(&NetworkFetcher::OnLoadComplete,
                                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 void NetworkFetcher::OnLoadComplete(URLResponsePtr response) {
   if (response->error) {
@@ skipping 10 matching lines @@
                << "while fetching " << response->url;
     loader_callback_.Run(make_scoped_ptr<Fetcher>(NULL));
     return;
   }
 
   response_ = response.Pass();
   loader_callback_.Run(make_scoped_ptr(this));
 }
 
 }  // namespace mojo