Revert 275293 "Add authentication support to AttachmentUploaderI..."

BUG=381581

> Add authentication support to AttachmentUploaderImpl.
> 
> Update AUI to request an access token and send an Authorization header
> with each requests.  If the server responds with 401, AUI invalidates
> its token, but does not retry.  Retries will be implemented in a future
> CL, probably at a higher level.
> 
> BUG=371516
> 
> Review URL: https://codereview.chromium.org/304253010

TBR=maniscalco@chromium.org

Review URL: https://codereview.chromium.org/316413002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275357 0039d316-1c4b-4281-b951-d872f2087c98

sync/internal_api/public/attachments/attachment_uploader_impl.h

@@ -7,7 +7,6 @@
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/threading/non_thread_safe.h"
-#include "google_apis/gaia/oauth2_token_service_request.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "sync/api/attachments/attachment_uploader.h"
 
@@ -24,23 +23,10 @@ class SYNC_EXPORT AttachmentUploaderImpl : public AttachmentUploader,
                                            public base::NonThreadSafe {
  public:
   // |url_prefix| is the URL prefix (including trailing slash) to be used when
-  // uploading attachments.
-  //
-  // |url_request_context_getter| provides a URLRequestContext.
-  //
-  // |account_id| is the account id to use for uploads.
-  //
-  // |scopes| is the set of scopes to use for uploads.
-  //
-  // |token_service_provider| provides an OAuth2 token service.
-  AttachmentUploaderImpl(
-      const std::string& url_prefix,
-      const scoped_refptr<net::URLRequestContextGetter>&
-          url_request_context_getter,
-      const std::string& account_id,
-      const OAuth2TokenService::ScopeSet& scopes,
-      scoped_ptr<OAuth2TokenServiceRequest::TokenServiceProvider>
-          token_service_provider);
+  // |uploading attachments.
+  AttachmentUploaderImpl(const std::string& url_prefix,
+                         const scoped_refptr<net::URLRequestContextGetter>&
+                             url_request_context_getter);
   virtual ~AttachmentUploaderImpl();
 
   // AttachmentUploader implementation.
@@ -57,10 +43,6 @@ class SYNC_EXPORT AttachmentUploaderImpl : public AttachmentUploader,
 
   std::string url_prefix_;
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
-  std::string account_id_;
-  OAuth2TokenService::ScopeSet scopes_;
-  scoped_ptr<OAuth2TokenServiceRequest::TokenServiceProvider>
-      token_service_provider_;
   StateMap state_map_;
   DISALLOW_COPY_AND_ASSIGN(AttachmentUploaderImpl);
 };

sync/sync_tests.gypi

@@ -389,7 +389,6 @@
       'suppress_wildcard': 1,
       'dependencies': [
         '../base/base.gyp:base',
-        '../google_apis/google_apis.gyp:google_apis_test_support',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',