Remove signin and persist from gaia_authenticator.

chrome/browser/sync/util/user_settings.cc

 // Copyright (c) 2009 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.
 //
 // This class isn't pretty. It's just a step better than globals, which is what
 // these were previously.
 
 #include "chrome/browser/sync/util/user_settings.h"
 
 #include "build/build_config.h"
@@ skipping 51 matching lines @@
       c = c | (static_cast<unsigned char>(*i - 'A') << 4);
     result.push_back(c);
   }
   return result;
 }
 
 static const char PASSWORD_HASH[] = "password_hash2";
 static const char SALT[] = "salt2";
 
 static const int kSaltSize = 20;
-static const int kCurrentDBVersion = 11;
+static const int kCurrentDBVersion = 12;
 
 UserSettings::ScopedDBHandle::ScopedDBHandle(UserSettings* settings)
     : mutex_lock_(settings->dbhandle_mutex_), handle_(&settings->dbhandle_) {
 }
 
 UserSettings::UserSettings() : dbhandle_(NULL) {
 }
 
 string UserSettings::email() const {
   AutoLock lock(mutex_);
@@ skipping 48 matching lines @@
         dst_syncdata_path = dst_syncdata_path.Append(
             DirectoryManager::GetSyncDataDatabaseFilename());
         if (!file_util::Move(src_syncdata_path, dst_syncdata_path)) {
           LOG(WARNING) << "Unable to upgrade UserSettings from v10";
           return;
         }
       }
       ExecOrDie(handle, "DROP TABLE shares");
       ExecOrDie(handle, "UPDATE db_version SET version = 11");
     // FALL THROUGH
+    case 11:
+      ExecOrDie(handle, "DROP TABLE signin_types");
+      ExecOrDie(handle, "UPDATE db_version SET version = 12");
+    // FALL THROUGH
     case kCurrentDBVersion:
       // Nothing to migrate.
       return;
   }
 }
 
 static void MakeCookiesTable(sqlite3* const dbhandle) {
   // This table keeps a list of auth tokens for each signed in account. There
   // will be as many rows as there are auth tokens per sign in.
   // The service_token column will store encrypted values.
   ExecOrDie(dbhandle,
             "CREATE TABLE cookies"
             " (email, service_name, service_token, "
             " PRIMARY KEY(email, service_name) ON CONFLICT REPLACE)");
 }
 
-static void MakeSigninTypesTable(sqlite3* const dbhandle) {
-  // With every successful gaia authentication, remember if it was
-  // a hosted domain or not.
-  ExecOrDie(dbhandle,
-            "CREATE TABLE signin_types"
-            " (signin, signin_type, "
-            " PRIMARY KEY(signin, signin_type) ON CONFLICT REPLACE)");
-}
-
 static void MakeClientIDTable(sqlite3* const dbhandle) {
   // Stores a single client ID value that can be used as the client id, if
   // there's not another such ID provided on the install.
   ExecOrDie(dbhandle, "CREATE TABLE client_id (id) ");
   {
     SQLStatement statement;
     statement.prepare(dbhandle,
                       "INSERT INTO client_id values ( ? )");
     statement.bind_string(0, Generate128BitRandomHexString());
     if (SQLITE_DONE != statement.step()) {
@@ skipping 64 matching lines @@
         statement.prepare(dbhandle.get(),
                           "INSERT INTO db_version values ( ? )");
         statement.bind_int(0, kCurrentDBVersion);
         if (SQLITE_DONE != statement.step()) {
           return false;
         }
       }
 
       MakeSigninsTable(dbhandle.get());
       MakeCookiesTable(dbhandle.get());
-      MakeSigninTypesTable(dbhandle.get());
       MakeClientIDTable(dbhandle.get());
     }
     transaction.Commit();
   }
 #if defined(OS_WIN)
   // Do not index this file. Scanning can occur every time we close the file,
   // which causes long delays in SQLite's file locking.
   const DWORD attrs = GetFileAttributes(settings_path.value().c_str());
   const BOOL attrs_set =
     SetFileAttributes(settings_path.value().c_str(),
@@ skipping 161 matching lines @@
   return hash == GetHashFromDigest(md5.GetDigest());
 }
 
 void UserSettings::SwitchUser(const string& username) {
   {
     AutoLock lock(mutex_);
     email_ = username;
   }
 }
 
-void UserSettings::RememberSigninType(const string& signin,
-                                      gaia::SignIn signin_type) {
-  ScopedDBHandle dbhandle(this);
-    SQLStatement statement;
-    statement.prepare(dbhandle.get(),
-                      "INSERT INTO signin_types(signin, signin_type)"
-                      " values ( ?, ? )");
-    statement.bind_string(0, signin);
-    statement.bind_int(1, static_cast<int>(signin_type));
-    if (SQLITE_DONE != statement.step()) {
-      LOG(FATAL) << sqlite3_errmsg(dbhandle.get());
-    }
-}
-
-gaia::SignIn UserSettings::RecallSigninType(const string& signin,
-                                            gaia::SignIn default_type) {
-  ScopedDBHandle dbhandle(this);
-  SQLStatement statement;
-  statement.prepare(dbhandle.get(),
-                    "SELECT signin_type from signin_types WHERE signin = ?");
-  statement.bind_string(0, signin);
-  int query_result = statement.step();
-  if (SQLITE_ROW == query_result) {
-    int signin_type = statement.column_int(0);
-    return static_cast<gaia::SignIn>(signin_type);
-  }
-  return default_type;
-}
-
 string UserSettings::GetClientId() {
   ScopedDBHandle dbhandle(this);
   SQLStatement statement;
   statement.prepare(dbhandle.get(), "SELECT id FROM client_id");
   int query_result = statement.step();
   string client_id;
   if (query_result == SQLITE_ROW)
     client_id = statement.column_string(0);
   return client_id;
 }
 
 void UserSettings::ClearAllServiceTokens() {
   ScopedDBHandle dbhandle(this);
   ExecOrDie(dbhandle.get(), "DELETE FROM cookies");
 }
 
 bool UserSettings::GetLastUser(string* username) {
   ScopedDBHandle dbhandle(this);
   SQLStatement query;
   query.prepare(dbhandle.get(), "SELECT email FROM cookies");
   if (SQLITE_ROW == query.step()) {
     *username = query.column_string(0);
     return true;
   } else {
     return false;
   }
 }
 
 }  // namespace browser_sync