Revert "Report data usage UMA for Chrome services"

sync/internal_api/public/http_bridge.h

 // Copyright 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.
 
 #ifndef SYNC_INTERNAL_API_PUBLIC_HTTP_BRIDGE_H_
 #define SYNC_INTERNAL_API_PUBLIC_HTTP_BRIDGE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 36 matching lines @@
 // This is a one-time use bridge. Create one for each request you want to make.
 // It is RefCountedThreadSafe because it can PostTask to the io loop, and thus
 // needs to stick around across context switches, etc.
 class SYNC_EXPORT_PRIVATE HttpBridge
     : public base::RefCountedThreadSafe<HttpBridge>,
       public HttpPostProviderInterface,
       public net::URLFetcherDelegate {
  public:
   HttpBridge(const std::string& user_agent,
              const scoped_refptr<net::URLRequestContextGetter>& context,
-             const NetworkTimeUpdateCallback& network_time_update_callback,
-             const BindToTrackerCallback& bind_to_tracker_callback);
+             const NetworkTimeUpdateCallback& network_time_update_callback);
 
   // HttpPostProvider implementation.
   void SetExtraRequestHeaders(const char* headers) override;
   void SetURL(const char* url, int port) override;
   void SetPostPayload(const char* content_type,
                       int content_length,
                       const char* content) override;
   bool MakeSynchronousPost(int* error_code, int* response_code) override;
   void Abort() override;
 
@@ skipping 105 matching lines @@
   mutable base::Lock fetch_state_lock_;
   URLFetchState fetch_state_;
 
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
 
   const scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
 
   // Callback for updating network time.
   NetworkTimeUpdateCallback network_time_update_callback_;
 
-  // A callback to tag Sync request to be able to record data use of this
-  // service by data_use_measurement component.
-  BindToTrackerCallback bind_to_tracker_callback_;
-
   DISALLOW_COPY_AND_ASSIGN(HttpBridge);
 };
 
 class SYNC_EXPORT HttpBridgeFactory : public HttpPostProviderFactory,
                                       public CancelationObserver {
  public:
   HttpBridgeFactory(
       const scoped_refptr<net::URLRequestContextGetter>&
           baseline_context_getter,
       const NetworkTimeUpdateCallback& network_time_update_callback,
       CancelationSignal* cancelation_signal);
   ~HttpBridgeFactory() override;
 
   // HttpPostProviderFactory:
-  void Init(const std::string& user_agent,
-            const BindToTrackerCallback& bind_to_tracker_callback) override;
+  void Init(const std::string& user_agent) override;
   HttpPostProviderInterface* Create() override;
   void Destroy(HttpPostProviderInterface* http) override;
 
   // CancelationObserver implementation:
   void OnSignalReceived() override;
 
  private:
   // The user agent to use in all requests.
   std::string user_agent_;
 
   // Protects |request_context_getter_| to allow releasing it's reference from
   // the sync thread, even when it's in use on the IO thread.
   base::Lock request_context_getter_lock_;
 
   // The request context getter used for making all requests.
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
 
   NetworkTimeUpdateCallback network_time_update_callback_;
 
   CancelationSignal* const cancelation_signal_;
 
-  // A callback to tag Sync request to be able to record data use of this
-  // service by data_use_measurement component.
-  BindToTrackerCallback bind_to_tracker_callback_;
-
   DISALLOW_COPY_AND_ASSIGN(HttpBridgeFactory);
 };
 
 }  //  namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_HTTP_BRIDGE_H_