Revert of Consolidate attachment URL construction.

sync/internal_api/attachments/attachment_downloader_impl_unittest.cc

 // Copyright 2014 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 "sync/api/attachments/attachment_downloader.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 169 matching lines @@
       new net::TestURLRequestContextGetter(message_loop_.message_loop_proxy());
   url_fetcher_factory_.set_remove_fetcher_on_delete(true);
   token_service_.reset(new MockOAuth2TokenService());
   token_service_->AddAccount(kAccountId);
   scoped_ptr<OAuth2TokenServiceRequest::TokenServiceProvider>
       token_service_provider(new TokenServiceProvider(token_service_.get()));
 
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaConstants::kChromeSyncOAuth2Scope);
   attachment_downloader_ =
-      AttachmentDownloader::Create(GURL(kAttachmentServerUrl),
+      AttachmentDownloader::Create(kAttachmentServerUrl,
                                    url_request_context_getter_,
                                    kAccountId,
                                    scopes,
                                    token_service_provider.Pass());
 }
 
 void AttachmentDownloaderImplTest::TearDown() {
   RunMessageLoop();
 }
 
@@ skipping 146 matching lines @@
       GoogleServiceAuthError::AuthErrorNone());
   RunMessageLoop();
   // Fail URLFetcher. This should trigger download failure. Access token
   // shouldn't be invalidated.
   CompleteDownload(net::HTTP_SERVICE_UNAVAILABLE);
   EXPECT_EQ(0, token_service()->num_invalidate_token());
   VerifyDownloadResult(id1, AttachmentDownloader::DOWNLOAD_UNSPECIFIED_ERROR);
 }
 
 }  // namespace syncer