Move all gcm activity types out of GCMStatsRecorder

chrome/browser/services/gcm/gcm_driver.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 "chrome/browser/services/gcm/gcm_driver.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/files/file_path.h"

[juyik, 2014/05/23 22:35:41]

Is this needed for this patch?

[jianli, 2014/05/23 22:37:55]

Yes. Now we need this because gcm_client.h does not include gcm_stats_recorder.h
which includes file_path.h indirectly.

[Nicolas Zea, 2014/05/24 00:01:29]

FilePath can be forward declared

[jianli, 2014/05/24 00:10:50]

It is forward declared in gcm_client.h and we need it in this place because
otherwise we will get a compiling error as:

d:\src\chromium\src\base\bind_internal.h(2780) : error C2079:
'base::internal::BindState<base::internal::RunnableAdapter<T>,void
(gcm::GCMDriver::IOWorker *,A1,A2,A3,A4,A5,A6),void
(base::internal::UnretainedWrapper<gcm::GCMDriver::IOWorker>,base::internal::PassedWrapper<scoped_ptr<gcm::GCMClientFactory,base::DefaultDeleter<gcm::GCMClientFactory>>>,gcm::GCMClient::ChromeBuildInfo,base::FilePath,std::vector<std::string,std::allocator<_Ty>>,scoped_refptr<net::URLRequestContextGetter>,scoped_refptr<base::SequencedTaskRunner>)>::p4_'
uses undefined class 'base::FilePath'

 #include "base/location.h"
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/common/chrome_version_info.h"
 #include "components/gcm_driver/gcm_app_handler.h"
 #include "components/gcm_driver/gcm_client_factory.h"
 #include "components/gcm_driver/system_encryptor.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/url_request/url_request_context_getter.h"
@@ skipping 790 matching lines @@
     LOG(WARNING) << "request_gcm_statistics_callback_ is NULL.";
 }
 
 std::string GCMDriver::SignedInUserName() const {
   if (IsStarted())
     return identity_provider_->GetActiveUsername();
   return std::string();
 }
 
 }  // namespace gcm