[Chrome OS] Refactor Canonicalize() method into base class to prepare for new Authenticator subclass

chrome/browser/chromeos/login/user_image_downloader.cc

 // Copyright (c) 2010 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/chromeos/login/user_image_downloader.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/chromeos/login/google_authenticator.h"
+#include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/image_downloader.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 125 matching lines @@
 bool UserImageDownloader::IsUserEntry(ListValue* email_list) const {
   for (size_t i = 0; i < email_list->GetSize(); ++i) {
     DictionaryValue* email_dictionary = NULL;
     if (!email_list->GetDictionary(i, &email_dictionary))
       continue;
 
     std::string email;
     if (!email_dictionary->GetStringASCII("address", &email))
       continue;
 
-    if (GoogleAuthenticator::Canonicalize(email) == username_)
+    if (Authenticator::Canonicalize(email) == username_)
       return true;
   }
   return false;
 }
 
 bool UserImageDownloader::GetImageURLFromLinks(ListValue* link_list,
                                                GURL* image_url) const {
   // In entry's list of links there should be one with rel pointing to photo
   // schema.
   for (size_t i = 0; i < link_list->GetSize(); ++i) {
@@ skipping 12 matching lines @@
     if (!link_dictionary->GetStringASCII("href", &url))
       continue;
 
     *image_url = GURL(url);
     return true;
   }
   return false;
 }
 
 }  // namespace chromeos