Revert 190531 "Get OAuth2TokenService working on Android."

trunk/src/chrome/browser/signin/oauth2_token_service_unittest.cc

 // Copyright 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 "base/stringprintf.h"
 #include "chrome/browser/signin/oauth2_token_service.h"
 #include "chrome/browser/signin/oauth2_token_service_factory.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/signin/token_service_unittest.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 99 matching lines @@
     TokenServiceTestHarness::TearDown();
   }
 
  protected:
   scoped_ptr<content::TestBrowserThread> io_thread_;
   net::TestURLFetcherFactory factory_;
   OAuth2TokenService* oauth2_service_;
   TestingOAuth2TokenServiceConsumer consumer_;
 };
 
-#if defined(OS_ANDROID)
-#define MAYBE_NoOAuth2RefreshToken DISABLED_NoOAuth2RefreshToken
-#define MAYBE_FailureShouldNotRetry DISABLED_FailureShouldNotRetry
-#else
-#define MAYBE_NoOAuth2RefreshToken NoOAuth2RefreshToken
-#define MAYBE_FailureShouldNotRetry FailureShouldNotRetry
-#endif  // defined(OS_ANDROID)
-
-TEST_F(OAuth2TokenServiceTest, MAYBE_NoOAuth2RefreshToken) {
+TEST_F(OAuth2TokenServiceTest, NoOAuth2RefreshToken) {
   scoped_ptr<OAuth2TokenService::Request> request(
       oauth2_service_->StartRequest(std::set<std::string>(), &consumer_));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(0, consumer_.number_of_correct_tokens_);
   EXPECT_EQ(1, consumer_.number_of_errors_);
 }
 
-TEST_F(OAuth2TokenServiceTest, MAYBE_FailureShouldNotRetry) {
+TEST_F(OAuth2TokenServiceTest, FailureShouldNotRetry) {
   service_->IssueAuthTokenForTest(GaiaConstants::kGaiaOAuth2LoginRefreshToken,
                                   "refreshToken");
   scoped_ptr<OAuth2TokenService::Request> request(oauth2_service_->StartRequest(
       std::set<std::string>(), &consumer_));
   message_loop_.RunUntilIdle();
 
   EXPECT_EQ(0, consumer_.number_of_correct_tokens_);
   EXPECT_EQ(0, consumer_.number_of_errors_);
   net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   EXPECT_TRUE(fetcher);
@@ skipping 352 matching lines @@
   EXPECT_EQ(1, consumer.number_of_errors_);
 
   fetcher = factory_.GetFetcherByID(0);
   EXPECT_TRUE(fetcher);
   fetcher->set_response_code(net::HTTP_UNAUTHORIZED);
   fetcher->SetResponseString("");
   fetcher->delegate()->OnURLFetchComplete(fetcher);
   EXPECT_EQ(0, consumer.number_of_correct_tokens_);
   EXPECT_EQ(2, consumer.number_of_errors_);
 }