Make GCMProfileService own GCMDriver, instead of deriving from it

chrome/browser/invalidation/ticl_profile_settings_provider.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/invalidation/ticl_profile_settings_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/services/gcm/gcm_driver.h"

[fgorski, 2014/05/19 17:33:32]

is that needed?

[jianli, 2014/05/19 18:37:20]

Removed.

 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 namespace invalidation {
 
 TiclProfileSettingsProvider::TiclProfileSettingsProvider(Profile* profile)
     : profile_(profile) {
   registrar_.Init(profile->GetPrefs());
   registrar_.Add(
@@ skipping 26 matching lines @@
           switches::kInvalidationUseGCMChannel)) {
     // Use GCM channel if it was enabled via a command-line switch.
     return true;
   }
 
   // By default, do not use GCM channel.
   return false;
 }
 
 }  // namespace invalidation