Support for shared invalidator client IDs

chrome/browser/invalidation/invalidation_service_android.cc

 // Copyright (c) 2013 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/invalidation_service_android.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/invalidation/invalidation_controller_android.h"
 #include "content/public/browser/notification_service.h"
 
@@ skipping 41 matching lines @@
 }
 
 syncer::InvalidatorState
 InvalidationServiceAndroid::GetInvalidatorState() const {
   DCHECK(CalledOnValidThread());
   return invalidator_state_;
 }
 
 std::string InvalidationServiceAndroid::GetInvalidatorClientId() const {
   DCHECK(CalledOnValidThread());
-  // TODO: Return a valid ID here.  See crbug.com/172391.
-  return "Bogus";
+  return invalidation_controller_->GetInvalidatorClientId();
 }
 
 void InvalidationServiceAndroid::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(type, chrome::NOTIFICATION_SYNC_REFRESH_REMOTE);
 
   content::Details<const syncer::ObjectIdInvalidationMap>
@@ skipping 13 matching lines @@
 }
 
 void InvalidationServiceAndroid::TriggerStateChangeForTest(
     syncer::InvalidatorState state) {
   DCHECK(CalledOnValidThread());
   invalidator_state_ = state;
   invalidator_registrar_.UpdateInvalidatorState(invalidator_state_);
 }
 
 } //  namespace invalidation