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

chrome/common/net/gaia/oauth2_mint_token_flow.h

 // 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.
 
 #ifndef CHROME_COMMON_NET_GAIA_OAUTH2_MINT_TOKEN_FLOW_H_
 #define CHROME_COMMON_NET_GAIA_OAUTH2_MINT_TOKEN_FLOW_H_
 
 #include <string>
 #include <vector>
 
-#include "base/memory/weak_ptr.h"
 #include "chrome/common/net/gaia/oauth2_api_call_flow.h"
 
 class GoogleServiceAuthError;
 class OAuth2MintTokenFlowTest;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace content {
 class URLFetcher;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 // IssueAdvice: messages to show to the user to get a user's approval.
 // The structure is as follows:
-// * Description 1
+// * Descritpion 1
 //   - Detail 1.1
 //   - Details 1.2
 // * Description 2
 //   - Detail 2.1
 //   - Detail 2.2
 //   - Detail 2.3
 // * Description 3
 //   - Detail 3.1
 struct IssueAdviceInfoEntry {
  public:
@@ skipping 66 matching lines @@
   };
   static void SetInterceptorForTests(InterceptorForTests* interceptor);
 
   OAuth2MintTokenFlow(net::URLRequestContextGetter* context,
                       Delegate* delegate,
                       const Parameters& parameters);
   virtual ~OAuth2MintTokenFlow();
 
   virtual void Start() OVERRIDE;
 
-  // Starts the flow, and deletes |this| when done. Useful when the caller
-  // does not care about the response (|delegate_| is NULL).
-  void FireAndForget();
-
  protected:
   // Implementation of template methods in OAuth2ApiCallFlow.
   virtual GURL CreateApiCallUrl() OVERRIDE;
   virtual std::string CreateApiCallBody() OVERRIDE;
 
   virtual void ProcessApiCallSuccess(
       const net::URLFetcher* source) OVERRIDE;
   virtual void ProcessApiCallFailure(
       const net::URLFetcher* source) OVERRIDE;
   virtual void ProcessNewAccessToken(const std::string& access_token) OVERRIDE;
   virtual void ProcessMintAccessTokenFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
 
  private:
   friend class OAuth2MintTokenFlowTest;
   FRIEND_TEST_ALL_PREFIXES(OAuth2MintTokenFlowTest, CreateApiCallBody);
   FRIEND_TEST_ALL_PREFIXES(OAuth2MintTokenFlowTest, ParseIssueAdviceResponse);
   FRIEND_TEST_ALL_PREFIXES(OAuth2MintTokenFlowTest, ParseMintTokenResponse);
   FRIEND_TEST_ALL_PREFIXES(OAuth2MintTokenFlowTest, ProcessApiCallSuccess);
   FRIEND_TEST_ALL_PREFIXES(OAuth2MintTokenFlowTest, ProcessApiCallFailure);
   FRIEND_TEST_ALL_PREFIXES(OAuth2MintTokenFlowTest,
       ProcessMintAccessTokenFailure);
 
   void ReportSuccess(const std::string& access_token);
-  void ReportIssueAdviceSuccess(const IssueAdviceInfo& issue_advice);
+  void ReportSuccess(const IssueAdviceInfo& issue_advice);
   void ReportFailure(const GoogleServiceAuthError& error);
 
   static bool ParseIssueAdviceResponse(
       const base::DictionaryValue* dict, IssueAdviceInfo* issue_advice);
   static bool ParseMintTokenResponse(
       const base::DictionaryValue* dict, std::string* access_token);
 
   net::URLRequestContextGetter* context_;
   Delegate* delegate_;
   Parameters parameters_;
-  // If true, |this| owns itself and will delete itself after reporting
-  // success or failure.
-  bool delete_when_done_;
-  base::WeakPtrFactory<OAuth2MintTokenFlow> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2MintTokenFlow);
 };
 
 #endif  // CHROME_COMMON_NET_GAIA_OAUTH2_MINT_TOKEN_FLOW_H_