Save the oauth client id used in App Notification setup

chrome/browser/extensions/extension_tab_helper.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 "chrome/browser/extensions/extension_tab_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
@@ skipping 161 matching lines @@
   content::RenderProcessHost* process =
       tab_contents_wrapper()->render_view_host()->process();
   const Extension* extension =
       extension_service->GetInstalledApp(requestor_url);
   bool allowed =
       extension &&
       extension->HasAPIPermission(
           ExtensionAPIPermission::kExperimental) &&
       process_map->Contains(extension->id(), process->GetID());
   if (!allowed) {
-    AppNotifyChannelSetupComplete("", "permission_error", return_route_id,
-                                  callback_id);
+    Send(new ExtensionMsg_GetAppNotifyChannelResponse(
+        return_route_id, "", "permission_error", callback_id));
     return;
   }
 
   AppNotifyChannelUI* ui = new AppNotifyChannelUIImpl(
       GetBrowser(), tab_contents_wrapper(), extension->name());
 
   scoped_refptr<AppNotifyChannelSetup> channel_setup(
       new AppNotifyChannelSetup(profile,
                                 extension->id(),
                                 client_id,
                                 requestor_url,
                                 return_route_id,
                                 callback_id,
                                 ui,
                                 this->AsWeakPtr()));
   channel_setup->Start();
   // We'll get called back in AppNotifyChannelSetupComplete.
 }
 
 void ExtensionTabHelper::AppNotifyChannelSetupComplete(
-    const std::string& client_id, const std::string& error, int return_route_id,
-    int callback_id) {
+    const std::string& channel_id,
+    const std::string& error,
+    const AppNotifyChannelSetup* setup) {
+  CHECK(setup);
+
+  // If the setup was successful, record that fact in ExtensionService.
+  if (!channel_id.empty() && error.empty()) {
+    Profile* profile =
+        Profile::FromBrowserContext(tab_contents()->browser_context());
+    ExtensionService* service = profile->GetExtensionService();
+    if (service->GetExtensionById(setup->extension_id(), true))
+      service->SetAppNotificationSetupDone(setup->extension_id(),
+                                           setup->client_id());
+  }
+
   Send(new ExtensionMsg_GetAppNotifyChannelResponse(
-      return_route_id, client_id, error, callback_id));
+      setup->return_route_id(), channel_id, error, setup->callback_id()));
 }
 
 void ExtensionTabHelper::OnRequest(
     const ExtensionHostMsg_Request_Params& request) {
   extension_function_dispatcher_.Dispatch(request,
                                           tab_contents()->render_view_host());
 }
 
 void ExtensionTabHelper::UpdateExtensionAppIcon(const Extension* extension) {
   extension_app_icon_.reset();
@@ skipping 49 matching lines @@
 }
 
 TabContents* ExtensionTabHelper::GetAssociatedTabContents() const {
   return tab_contents();
 }
 
 gfx::NativeView ExtensionTabHelper::GetNativeViewOfHost() {
   RenderWidgetHostView* rwhv = tab_contents()->GetRenderWidgetHostView();
   return rwhv ? rwhv->GetNativeView() : NULL;
 }