Merge 113575 - SQLitePersistentCookieStore fix: Don't abuse SQL_FROM_HERE.

chrome/browser/net/sqlite_persistent_cookie_store.cc

 // Copyright (c) 2011 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/net/sqlite_persistent_cookie_store.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 508 matching lines @@
                  this, loaded_callback, load_success));
     if (!restore_old_session_cookies_)
       DeleteSessionCookies();
   }
 }
 
 bool SQLitePersistentCookieStore::Backend::LoadCookiesForDomains(
   const std::set<std::string>& domains) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
-  const char* sql;
+  sql::Statement smt;
   if (restore_old_session_cookies_) {
-    sql =
-        "SELECT creation_utc, host_key, name, value, path, expires_utc, "
-        "secure, httponly, last_access_utc, has_expires, persistent "
-        "FROM cookies WHERE host_key = ?";
+    smt.Assign(db_->GetCachedStatement(
+      SQL_FROM_HERE,
+      "SELECT creation_utc, host_key, name, value, path, expires_utc, "
+      "secure, httponly, last_access_utc, has_expires, persistent "
+      "FROM cookies WHERE host_key = ?"));
   } else {
-    sql =
-        "SELECT creation_utc, host_key, name, value, path, expires_utc, "
-        "secure, httponly, last_access_utc, has_expires, persistent "
-        "FROM cookies WHERE host_key = ? AND persistent == 1";
+    smt.Assign(db_->GetCachedStatement(
+      SQL_FROM_HERE,
+      "SELECT creation_utc, host_key, name, value, path, expires_utc, "
+      "secure, httponly, last_access_utc, has_expires, persistent "
+      "FROM cookies WHERE host_key = ? AND persistent = 1"));
   }
-  sql::Statement smt(db_->GetCachedStatement(SQL_FROM_HERE, sql));
   if (!smt) {
     NOTREACHED() << "select statement prep failed";
     db_.reset();
     return false;
   }
 
   std::vector<net::CookieMonster::CanonicalCookie*> cookies;
   std::set<std::string>::const_iterator it = domains.begin();
   for (; it != domains.end(); ++it) {
     smt.BindString(0, *it);
@@ skipping 359 matching lines @@
   if (backend_.get())
     backend_->SetClearLocalStateOnExit(clear_local_state);
 }
 
 void SQLitePersistentCookieStore::Flush(Task* completion_task) {
   if (backend_.get())
     backend_->Flush(completion_task);
   else if (completion_task)
     MessageLoop::current()->PostTask(FROM_HERE, completion_task);
 }