Save the oauth client id used in App Notification setup

chrome/browser/extensions/app_notify_channel_setup_unittest.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/extensions/app_notify_channel_setup.h"
@@ skipping 53 matching lines @@
 
 class TestDelegate : public AppNotifyChannelSetup::Delegate,
                      public base::SupportsWeakPtr<TestDelegate> {
  public:
   TestDelegate() : was_called_(false) {}
   virtual ~TestDelegate() {}
 
   virtual void AppNotifyChannelSetupComplete(
       const std::string& channel_id,
       const std::string& error,
-      int route_id,
-      int callback_id) OVERRIDE {
+      const AppNotifyChannelSetup* setup) OVERRIDE {
     EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
     EXPECT_FALSE(was_called_);
     was_called_ = true;
     error_ = error;
-    route_id_ = route_id;
-    callback_id_ = callback_id;
+    route_id_ = setup->return_route_id();
+    callback_id_ = setup->callback_id();
     MessageLoop::current()->Quit();
   }
 
   // Called to check that we were called with the expected arguments.
   void ExpectWasCalled(const std::string& expected_channel_id,
                        const std::string& expected_error) {
     EXPECT_TRUE(was_called_);
     EXPECT_EQ(expected_error, error_);
     EXPECT_EQ(kRouteId, route_id_);
     EXPECT_EQ(kCallbackId, callback_id_);
@@ skipping 174 matching lines @@
 
 TEST_F(AppNotifyChannelSetupTest, ServerSuccess) {
   SetupLogin(true);
   SetupFetchTokens(true, false);
   SetupRecordGrant(true);
   SetupGetChannelId(true);
 
   scoped_refptr<AppNotifyChannelSetup> setup = CreateInstance();
   RunServerTest(setup, "dummy_do_not_use", "");
 }