Save the oauth client id used in App Notification setup

chrome/browser/extensions/app_notify_channel_setup.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_APP_NOTIFY_CHANNEL_SETUP_H_
 #define CHROME_BROWSER_EXTENSIONS_APP_NOTIFY_CHANNEL_SETUP_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 24 matching lines @@
     : public content::URLFetcherDelegate,
       public content::NotificationObserver,
       public AppNotifyChannelUI::Delegate,
       public base::RefCountedThreadSafe<AppNotifyChannelSetup> {
  public:
   class Delegate {
    public:
     // If successful, |channel_id| will be non-empty. On failure, |channel_id|
     // will be empty and |error| will contain an error to report to the JS
     // callback.
-    virtual void AppNotifyChannelSetupComplete(const std::string& channel_id,
-                                               const std::string& error,
-                                               int return_route_id,
-                                               int callback_id) = 0;
+    virtual void AppNotifyChannelSetupComplete(
+        const std::string& channel_id,
+        const std::string& error,
+        const AppNotifyChannelSetup* setup) = 0;
   };
 
+  // For tests, we allow intercepting the request to setup the channel and
+  // forcing the return of a certain result to the delegate.
+  class InterceptorForTests {
+   public:
+    virtual void DoIntercept(const AppNotifyChannelSetup* setup,
+                             std::string* result_channel_id,
+                             std::string* result_error) = 0;
+  };
+  static void SetInterceptorForTests(InterceptorForTests* interceptor);
+
   // Ownership of |ui| is transferred to this object.
   AppNotifyChannelSetup(Profile* profile,
                         const std::string& extension_id,
                         const std::string& client_id,
                         const GURL& requestor_url,
                         int return_route_id,
                         int callback_id,
                         AppNotifyChannelUI* ui,
                         base::WeakPtr<Delegate> delegate);
 
   AppNotifyChannelUI* ui() { return ui_.get(); }
 
   // This begins the process of fetching the channel id using the browser login
   // credentials (or using |ui_| to prompt for login if needed).
   void Start();
 
   // Implementing content::NotificationObserver interface.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
+
+  // Getters for various members.
+  const std::string& extension_id() const { return extension_id_; }
+  const std::string& client_id() const { return client_id_; }
+  int return_route_id() const { return return_route_id_; }
+  int callback_id() const { return callback_id_; }
+
  protected:
   // content::URLFetcherDelegate.
   virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
   // AppNotifyChannelUI::Delegate.
   virtual void OnSyncSetupResult(bool enabled) OVERRIDE;
 
  private:
   enum State {
     INITIAL,
@@ skipping 57 matching lines @@
   scoped_ptr<content::URLFetcher> url_fetcher_;
   scoped_ptr<AppNotifyChannelUI> ui_;
   State state_;
   int fetch_token_success_count_;
   int fetch_token_fail_count_;
 
   DISALLOW_COPY_AND_ASSIGN(AppNotifyChannelSetup);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_APP_NOTIFY_CHANNEL_SETUP_H_