Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/webdata/web_intents_table.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/webdata/web_intents_table.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "sql/statement.h"
 
+using webkit_glue::WebIntentServiceData;
+
 namespace {
+
 bool ExtractIntents(sql::Statement* s,
                     std::vector<WebIntentServiceData>* services) {
   DCHECK(s);
   while (s->Step()) {
     WebIntentServiceData service;
     string16 tmp = s->ColumnString16(0);
     service.service_url = GURL(tmp);
 
     service.action = s->ColumnString16(1);
     service.type = s->ColumnString16(2);
     service.title = s->ColumnString16(3);
     tmp = s->ColumnString16(4);
      // Default to window disposition.
     service.disposition = WebIntentServiceData::DISPOSITION_WINDOW;
     if (tmp == ASCIIToUTF16("inline"))
       service.disposition = WebIntentServiceData::DISPOSITION_INLINE;
     services->push_back(service);
   }
   return true;
 }
-}
+
+}  // namespace
 
 WebIntentsTable::WebIntentsTable(sql::Connection* db,
                                  sql::MetaTable* meta_table)
     : WebDatabaseTable(db, meta_table) {
 }
 
 WebIntentsTable::~WebIntentsTable() {
 }
 
 bool WebIntentsTable::Init() {
@@ skipping 16 matching lines @@
   return true;
 }
 
 // TODO(jhawkins): Figure out Sync story.
 bool WebIntentsTable::IsSyncable() {
   return false;
 }
 
 bool WebIntentsTable::GetWebIntents(
     const string16& action,
-    std::vector<WebIntentServiceData>* intents) {
-  DCHECK(intents);
+    std::vector<WebIntentServiceData>* services) {
+  DCHECK(services);
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT service_url, action, type, title, disposition FROM web_intents "
       "WHERE action=?"));
   if (!s)
     NOTREACHED() << "Statement prepare failed";
 
   s.BindString16(0, action);
-  return ExtractIntents(&s, intents);
+  return ExtractIntents(&s, services);
 }
 
 bool WebIntentsTable::GetAllWebIntents(
-    std::vector<WebIntentServiceData>* intents) {
-  DCHECK(intents);
+    std::vector<WebIntentServiceData>* services) {
+  DCHECK(services);
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT service_url, action, type, title, disposition FROM web_intents"));
   if (!s)
     NOTREACHED() << "Statement prepare failed";
 
-  return ExtractIntents(&s, intents);
+  return ExtractIntents(&s, services);
 }
 
-bool WebIntentsTable::SetWebIntent(const WebIntentServiceData& intent) {
+bool WebIntentsTable::SetWebIntent(const WebIntentServiceData& service) {
   sql::Statement s(db_->GetUniqueStatement(
       "INSERT OR REPLACE INTO web_intents "
       "(service_url, type, action, title, disposition) "
       "VALUES (?, ?, ?, ?, ?)"));
   if (!s)
     NOTREACHED() << "Statement prepare failed";
 
   // Default to window disposition.
   string16 disposition = ASCIIToUTF16("window");
-  if (intent.disposition == WebIntentServiceData::DISPOSITION_INLINE)
+  if (service.disposition == WebIntentServiceData::DISPOSITION_INLINE)
     disposition = ASCIIToUTF16("inline");
-  s.BindString(0, intent.service_url.spec());
-  s.BindString16(1, intent.type);
-  s.BindString16(2, intent.action);
-  s.BindString16(3, intent.title);
+  s.BindString(0, service.service_url.spec());
+  s.BindString16(1, service.type);
+  s.BindString16(2, service.action);
+  s.BindString16(3, service.title);
   s.BindString16(4, disposition);
   return s.Run();
 }
 
 // TODO(jhawkins): Investigate the need to remove rows matching only
-// |intent.service_url|. It's unlikely the user will be given the ability to
+// |service.service_url|. It's unlikely the user will be given the ability to
 // remove at the granularity of actions or types.
-bool WebIntentsTable::RemoveWebIntent(const WebIntentServiceData& intent) {
+bool WebIntentsTable::RemoveWebIntent(const WebIntentServiceData& service) {
   sql::Statement s(db_->GetUniqueStatement(
       "DELETE FROM web_intents "
       "WHERE service_url = ? AND action = ? AND type = ?"));
   if (!s)
     NOTREACHED() << "Statement prepare failed";
 
-  s.BindString(0, intent.service_url.spec());
-  s.BindString16(1, intent.action);
-  s.BindString16(2, intent.type);
+  s.BindString(0, service.service_url.spec());
+  s.BindString16(1, service.action);
+  s.BindString16(2, service.type);
   return s.Run();
 }