summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-28 20:17:50 +0000
committercmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-28 20:17:50 +0000
commit53b6c4131d469528af32c8a9f34084c22a3140b2 (patch)
tree1aa520dae60ad5dad61dccac4d062e681d5baf6d
parentb15f2acf86d605611531fbf741f7378b0d4dca05 (diff)
downloadchromium_src-53b6c4131d469528af32c8a9f34084c22a3140b2.zip
chromium_src-53b6c4131d469528af32c8a9f34084c22a3140b2.tar.gz
chromium_src-53b6c4131d469528af32c8a9f34084c22a3140b2.tar.bz2
Fix nit for oshima
http://src.chromium.org/viewvc/chrome?view=rev&revision=53913 accidentally landed a cleaned up version of the change reviewed in http://codereview.chromium.org/2847080/show This change introduces a style nit fix, but is also so that someone can review the ExpectCanceledFetcher (which replaces and simplifies TimedMockFetcher) in google_authenticator_unittest.cc BUG=None TEST=unit tests Review URL: http://codereview.chromium.org/3077006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54006 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/login/google_authenticator_unittest.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/google_authenticator_unittest.cc b/chrome/browser/chromeos/login/google_authenticator_unittest.cc
index d958387..4676ff0 100644
--- a/chrome/browser/chromeos/login/google_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/google_authenticator_unittest.cc
@@ -61,7 +61,7 @@ class ExpectCanceledFetcher : public URLFetcher {
: URLFetcher(url, request_type, d) {
}
- ~ExpectCanceledFetcher() {
+ virtual ~ExpectCanceledFetcher() {
task_->Cancel();
}
@@ -518,6 +518,8 @@ TEST_F(GoogleAuthenticatorTest, CheckLocalaccount) {
auth->CheckLocalaccount(std::string());
}
+namespace {
+
// Compatible with LoginStatusConsumer::OnLoginSuccess()
static void OnSuccessQuit(
const std::string& username,
@@ -542,6 +544,8 @@ static void OnFailQuitAndFail(const std::string& error) {
MessageLoop::current()->Quit();
}
+} // anonymous namespace
+
TEST_F(GoogleAuthenticatorTest, LocalaccountLogin) {
// This test checks the logic that governs asynchronously reading the
// localaccount name off disk and trying to authenticate against it