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

chrome/common/net/gaia/oauth2_mint_token_flow.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/common/net/gaia/oauth2_mint_token_flow.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 90 matching lines @@
 
 OAuth2MintTokenFlow::OAuth2MintTokenFlow(
     URLRequestContextGetter* context,
     Delegate* delegate,
     const Parameters& parameters)
     : OAuth2ApiCallFlow(
           context, parameters.login_refresh_token,
           "", std::vector<std::string>()),
       context_(context),
       delegate_(delegate),
-      parameters_(parameters),
-      delete_when_done_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      parameters_(parameters) {
 }
 
 OAuth2MintTokenFlow::~OAuth2MintTokenFlow() { }
 
 void OAuth2MintTokenFlow::Start() {
   if (g_interceptor_for_tests) {
     std::string auth_token;
     GoogleServiceAuthError error = GoogleServiceAuthError::None();
 
     // We use PostTask, instead of calling the delegate directly, because the
     // message loop will run a few times before we notify the delegate in the
     // real implementation.
     if (g_interceptor_for_tests->DoIntercept(this, &auth_token, &error)) {
       MessageLoop::current()->PostTask(
           FROM_HERE,
-          base::Bind(&OAuth2MintTokenFlow::ReportSuccess,
-                     weak_factory_.GetWeakPtr(), auth_token));
+          base::Bind(&OAuth2MintTokenFlow::Delegate::OnMintTokenSuccess,
+                     base::Unretained(delegate_), auth_token));
     } else {
       MessageLoop::current()->PostTask(
           FROM_HERE,
-          base::Bind(&OAuth2MintTokenFlow::ReportFailure,
-                     weak_factory_.GetWeakPtr(), error));
+          base::Bind(&OAuth2MintTokenFlow::Delegate::OnMintTokenFailure,
+                     base::Unretained(delegate_), error));
     }
     return;
   }
 
-
   OAuth2ApiCallFlow::Start();
 }
 
-void OAuth2MintTokenFlow::FireAndForget() {
-  delete_when_done_ = true;
-  Start();
+void OAuth2MintTokenFlow::ReportSuccess(const std::string& access_token) {
+  if (delegate_) {
+    delegate_->OnMintTokenSuccess(access_token);
+  }
 }
 
-void OAuth2MintTokenFlow::ReportSuccess(const std::string& access_token) {
-  if (delegate_)
-    delegate_->OnMintTokenSuccess(access_token);
-
-  if (delete_when_done_)
-    delete this;
-}
-
-void OAuth2MintTokenFlow::ReportIssueAdviceSuccess(
-    const IssueAdviceInfo& issue_advice) {
-  if (delegate_)
+void OAuth2MintTokenFlow::ReportSuccess(const IssueAdviceInfo& issue_advice) {
+  if (delegate_) {
     delegate_->OnIssueAdviceSuccess(issue_advice);
-
-  if (delete_when_done_)
-    delete this;
+  }
 }
 
 void OAuth2MintTokenFlow::ReportFailure(
     const GoogleServiceAuthError& error) {
-  if (delegate_)
+  if (delegate_) {
     delegate_->OnMintTokenFailure(error);
-
-  if (delete_when_done_)
-    delete this;
+  }
 }
 
 GURL OAuth2MintTokenFlow::CreateApiCallUrl() {
   return GURL(GaiaUrls::GetInstance()->oauth2_issue_token_url());
 }
 
 std::string OAuth2MintTokenFlow::CreateApiCallBody() {
   const char* force_value =
       (parameters_.mode == MODE_MINT_TOKEN_FORCE ||
        parameters_.mode == MODE_RECORD_GRANT)
@@ skipping 26 matching lines @@
   }
 
   std::string issue_advice;
   if (!dict->GetString(kIssueAdviceKey, &issue_advice)) {
     ReportFailure(GoogleServiceAuthError::FromConnectionError(101));
     return;
   }
   if (issue_advice == kIssueAdviceValueConsent) {
     IssueAdviceInfo issue_advice;
     if (ParseIssueAdviceResponse(dict, &issue_advice))
-      ReportIssueAdviceSuccess(issue_advice);
+      ReportSuccess(issue_advice);
     else
       ReportFailure(GoogleServiceAuthError::FromConnectionError(101));
   } else {
     std::string access_token;
     if (ParseMintTokenResponse(dict, &access_token))
       ReportSuccess(access_token);
     else
       ReportFailure(GoogleServiceAuthError::FromConnectionError(101));
   }
-
-  // |this| may be deleted!
 }
 
 void OAuth2MintTokenFlow::ProcessApiCallFailure(
     const net::URLFetcher* source) {
   ReportFailure(CreateAuthError(source->GetStatus()));
 }
 void OAuth2MintTokenFlow::ProcessNewAccessToken(
     const std::string& access_token) {
   // We don't currently store new access tokens. We generate one every time.
   // So we have nothing to do here.
@@ skipping 40 matching lines @@
 
     Tokenize(detail, kDetailSeparators, &entry.details);
     issue_advice->push_back(entry);
   }
 
   if (!success)
     issue_advice->clear();
 
   return success;
 }