Revert r 144574 "Modify experimental identity flow to display scope descriptions and details."

chrome/browser/extensions/crx_installer.cc

 // Copyright (c) 2012 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/crx_installer.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 81 matching lines @@
       delete_source_(false),
       create_app_shortcut_(false),
       frontend_weak_(frontend_weak),
       profile_(frontend_weak->profile()),
       client_(client),
       apps_require_extension_mime_type_(false),
       allow_silent_install_(false),
       install_cause_(extension_misc::INSTALL_CAUSE_UNSET),
       creation_flags_(Extension::NO_FLAGS),
       off_store_install_allow_reason_(OffStoreInstallDisallowed),
-      did_handle_successfully_(true),
-      record_oauth2_grant_(false) {
+      did_handle_successfully_(true) {
   if (!approval)
     return;
 
   CHECK(profile_->IsSameProfile(approval->profile));
   client_->install_ui()->SetUseAppInstalledBubble(
       approval->use_app_installed_bubble);
   client_->install_ui()->SetSkipPostInstallUI(approval->skip_post_install_ui);
 
   if (approval->skip_install_dialog) {
     // Mark the extension as approved, but save the expected manifest and ID
     // so we can check that they match the CRX's.
     approved_ = true;
     expected_manifest_.reset(approval->parsed_manifest->DeepCopy());
     expected_id_ = approval->extension_id;
-    record_oauth2_grant_ = approval->record_oauth2_grant;
   }
 }
 
 CrxInstaller::~CrxInstaller() {
   // Delete the temp directory and crx file as necessary. Note that the
   // destructor might be called on any thread, so we post a task to the file
   // thread to make sure the delete happens there. This is a best effort
   // operation since the browser can be shutting down so there might not
   // be a file thread to post to.
   if (!temp_dir_.value().empty()) {
@@ skipping 453 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!frontend_weak_.get())
     return;
 
   // If there is a client, tell the client about installation.
   if (client_) {
     client_->OnInstallSuccess(extension_.get(), install_icon_.get());
   }
 
-  if (client_ && !approved_)
-    record_oauth2_grant_ = client_->record_oauth2_grant();
-
   // We update the extension's granted permissions if the user already approved
   // the install (client_ is non NULL), or we are allowed to install this
   // silently.
   if (client_ || allow_silent_install_) {
     PermissionsUpdater perms_updater(profile());
-    perms_updater.GrantActivePermissions(extension_, record_oauth2_grant_);
+    perms_updater.GrantActivePermissions(extension_);
   }
 
   // Tell the frontend about the installation and hand off ownership of
   // extension_ to it.
   frontend_weak_->OnExtensionInstalled(extension_, is_gallery_install(),
                                        page_ordinal_);
 
   NotifyCrxInstallComplete(extension_.get());
 
   extension_ = NULL;
 
   // We're done. We don't post any more tasks to ourselves so we are deleted
   // soon.
 }
 
 void CrxInstaller::NotifyCrxInstallComplete(const Extension* extension) {
   // Some users (such as the download shelf) need to know when a
   // CRXInstaller is done.  Listening for the EXTENSION_* events
   // is problematic because they don't know anything about the
   // extension before it is unpacked, so they cannot filter based
   // on the extension.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_CRX_INSTALLER_DONE,
       content::Source<CrxInstaller>(this),
       content::Details<const Extension>(extension));
 }