[Android] Fix remaining linker errors for components build

android_webview/browser/net/aw_url_request_job_factory.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 "android_webview/browser/net/aw_url_request_job_factory.h"
 
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_error_job.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_job_manager.h"
 
 using net::NetworkDelegate;
 using net::URLRequest;
 using net::URLRequestJob;
 
 namespace android_webview {
 
 AwURLRequestJobFactory::AwURLRequestJobFactory()
     : next_factory_(new net::URLRequestJobFactoryImpl()) {
 }
 
 AwURLRequestJobFactory::~AwURLRequestJobFactory() {
 }
 
 bool AwURLRequestJobFactory::IsHandledProtocol(
     const std::string& scheme) const {
   // This introduces a dependency on the URLRequestJobManager

[joth, 2013/03/27 20:33:19]

Making the change you have below means this comment is even harder to follow, as
there is no direct code dependency any more

[Yaron, 2013/03/27 21:18:53]

Indeed.

   // implementation. The assumption is that if true is returned from this
   // method it is still valid to return NULL from the
   // MaybeCreateJobWithProtocolHandler method and in that case the
   // URLRequestJobManager will try and create the URLRequestJob by using the
   // set of built in handlers.
   return true;
 }
 
 bool AwURLRequestJobFactory::IsHandledURL(const GURL& url) const {
   return true;
 }
 
 URLRequestJob* AwURLRequestJobFactory::MaybeCreateJobWithProtocolHandler(
     const std::string& scheme,
     URLRequest* request,
     NetworkDelegate* network_delegate) const {
   URLRequestJob* job = next_factory_->MaybeCreateJobWithProtocolHandler(
       scheme, request, network_delegate);
 
   if (job)
     return job;
 
-  // If the URLRequestJobManager supports the scheme NULL should be returned
-  // from this method. In that case the built in handlers in
-  // URLRequestJobManager will then be used to create the job.
-  if (net::URLRequestJobManager::GetInstance()->SupportsScheme(scheme))
+  // If URLRequest supports the scheme NULL should be returned from this method.
+  // In that case the built in handlers will then be used to create the job.

[joth, 2013/03/27 20:33:19]

this comment add "see the ASSUMPTION in IsHandledProtocol above"

[Yaron, 2013/03/27 21:18:53]

Done.

+  if (net::URLRequest::IsHandledProtocol(scheme))
     return NULL;
 
   return new net::URLRequestErrorJob(
       request, network_delegate, net::ERR_UNKNOWN_URL_SCHEME);
 }
 
 bool AwURLRequestJobFactory::SetProtocolHandler(
     const std::string& scheme,
     ProtocolHandler* protocol_handler) {
   return next_factory_->SetProtocolHandler(scheme, protocol_handler);
 }
 
 } // namespace android_webview