IndexedDB: A handful of additional coding style corrections, c/o cpplint

BUG=234278
R=alecflett@chromium.org

Review URL: https://chromiumcodereview.appspot.com/16408014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204758 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 28 insertions, 26 deletions

diff --git a/content/browser/indexed_db/indexed_db_database_error.h b/content/browser/indexed_db/indexed_db_database_error.h
index 6c53db4..2a56d76 100644
--- a/content/browser/indexed_db/indexed_db_database_error.h
+++ b/content/browser/indexed_db/indexed_db_database_error.h
@@ -18,7 +18,7 @@ class IndexedDBDatabaseError {
       : code_(code), message_(ASCIIToUTF16(message)) {}
   IndexedDBDatabaseError(uint16 code, const string16& message)
       : code_(code), message_(message) {}
-  IndexedDBDatabaseError(const WebKit::WebIDBDatabaseError& other)
+  explicit IndexedDBDatabaseError(const WebKit::WebIDBDatabaseError& other)
       : code_(other.code()), message_(other.message()) {}
   ~IndexedDBDatabaseError() {}
 
diff --git a/content/browser/indexed_db/indexed_db_database_unittest.cc b/content/browser/indexed_db/indexed_db_database_unittest.cc
index e72b891..93af23b 100644
--- a/content/browser/indexed_db/indexed_db_database_unittest.cc
+++ b/content/browser/indexed_db/indexed_db_database_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "content/browser/indexed_db/indexed_db_database.h"
 
+#include <gtest/gtest.h>
+
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/string16.h"
@@ -18,8 +20,6 @@
 #include "content/browser/indexed_db/indexed_db_transaction.h"
 #include "content/browser/indexed_db/webidbdatabase_impl.h"
 
-#include <gtest/gtest.h>
-
 using WebKit::WebIDBDatabase;
 using WebKit::WebIDBDatabaseError;
 using WebKit::WebIDBDatabaseCallbacks;
@@ -48,25 +48,25 @@ class MockIDBCallbacks : public IndexedDBCallbacksWrapper {
     return make_scoped_refptr(new MockIDBCallbacks());
   }
   virtual void OnError(const IndexedDBDatabaseError& error) OVERRIDE {}
-  virtual void OnSuccess(const std::vector<string16>&) OVERRIDE {}
+  virtual void OnSuccess(const std::vector<string16>& value) OVERRIDE {}
   virtual void OnSuccess(scoped_refptr<IndexedDBCursor> cursor,
-                         const IndexedDBKey&,
-                         const IndexedDBKey&,
-                         std::vector<char>*) OVERRIDE {}
-  virtual void OnSuccess(scoped_refptr<IndexedDBDatabase>,
-                         const IndexedDBDatabaseMetadata&) OVERRIDE {
+                         const IndexedDBKey& key,
+                         const IndexedDBKey& primary_key,
+                         std::vector<char>* value) OVERRIDE {}
+  virtual void OnSuccess(scoped_refptr<IndexedDBDatabase> db,
+                         const IndexedDBDatabaseMetadata& metadata) OVERRIDE {
     was_success_db_called_ = true;
   }
-  virtual void OnSuccess(const IndexedDBKey&) OVERRIDE {}
-  virtual void OnSuccess(std::vector<char>*) OVERRIDE {}
-  virtual void OnSuccess(std::vector<char>*,
-                         const IndexedDBKey&,
-                         const IndexedDBKeyPath&) OVERRIDE {}
-  virtual void OnSuccess(int64) OVERRIDE {}
+  virtual void OnSuccess(const IndexedDBKey& key) OVERRIDE {}
+  virtual void OnSuccess(std::vector<char>* value) OVERRIDE {}
+  virtual void OnSuccess(std::vector<char>* value,
+                         const IndexedDBKey& key,
+                         const IndexedDBKeyPath& key_path) OVERRIDE {}
+  virtual void OnSuccess(int64 value) OVERRIDE {}
   virtual void OnSuccess() OVERRIDE {}
-  virtual void OnSuccess(const IndexedDBKey&,
-                         const IndexedDBKey&,
-                         std::vector<char>*) OVERRIDE {}
+  virtual void OnSuccess(const IndexedDBKey& key,
+                         const IndexedDBKey& primary_key,
+                         std::vector<char>* value) OVERRIDE {}
   virtual void OnSuccessWithPrefetch(
       const std::vector<IndexedDBKey>& keys,
       const std::vector<IndexedDBKey>& primary_keys,
diff --git a/content/browser/indexed_db/indexed_db_factory_impl.cc b/content/browser/indexed_db/indexed_db_factory_impl.cc
index 4a76f74..5dba7ac 100644
--- a/content/browser/indexed_db/indexed_db_factory_impl.cc
+++ b/content/browser/indexed_db/indexed_db_factory_impl.cc
@@ -61,7 +61,7 @@ void IndexedDBFactoryImpl::GetDatabaseNames(
     callbacks->OnError(IndexedDBDatabaseError(
         WebKit::WebIDBDatabaseExceptionUnknownError,
         "Internal error opening backing store for "
-        "indexed_db.webkit_get_database_names."));
+        "indexedDB.webkitGetDatabaseNames."));
     return;
   }
 
diff --git a/content/browser/indexed_db/indexed_db_leveldb_coding.cc b/content/browser/indexed_db/indexed_db_leveldb_coding.cc
index 54aebdc..c10bdc6 100644
--- a/content/browser/indexed_db/indexed_db_leveldb_coding.cc
+++ b/content/browser/indexed_db/indexed_db_leveldb_coding.cc
@@ -554,7 +554,6 @@ bool DecodeIDBKeyPath(StringPiece* slice, IndexedDBKeyPath* value) {
 }
 
 bool ExtractEncodedIDBKey(StringPiece* slice) {
-
   unsigned char type = (*slice)[0];
   slice->remove_prefix(1);
 
diff --git a/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc b/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc
index 300eac8..13c3300 100644
--- a/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc
+++ b/content/browser/indexed_db/indexed_db_leveldb_coding_unittest.cc
@@ -597,7 +597,6 @@ TEST(IndexedDBLevelDBCodingTest, EncodeDecodeIDBKeyPath) {
 
   ASSERT_EQ(key_paths.size(), encoded_paths.size());
   for (size_t i = 0; i < key_paths.size(); ++i) {
-
     IndexedDBKeyPath key_path = key_paths[i];
     std::vector<char> encoded = encoded_paths[i];
 
@@ -636,7 +635,6 @@ TEST(IndexedDBLevelDBCodingTest, DecodeLegacyIDBKeyPath) {
 
   ASSERT_EQ(key_paths.size(), encoded_paths.size());
   for (size_t i = 0; i < key_paths.size(); ++i) {
-
     IndexedDBKeyPath key_path = key_paths[i];
     std::string encoded = encoded_paths[i];
 
diff --git a/content/browser/indexed_db/leveldb/avltree.h b/content/browser/indexed_db/leveldb/avltree.h
index efd293e..91df048 100644
--- a/content/browser/indexed_db/leveldb/avltree.h
+++ b/content/browser/indexed_db/leveldb/avltree.h
@@ -343,7 +343,7 @@ class AVLTree {
     unsigned depth_;
 
     // Handles of nodes in path from root to current node (returned by *).
-    const static size_t kPathSize = maxDepth - 1;
+    static const size_t kPathSize = maxDepth - 1;
     handle path_h_[kPathSize];
 
     int CmpKN(key k, handle h) { return tree_->abs_.CompareKeyNode(k, h); }
diff --git a/content/browser/indexed_db/leveldb/leveldb_database.h b/content/browser/indexed_db/leveldb/leveldb_database.h
index c16202a..5c3d610 100644
--- a/content/browser/indexed_db/leveldb/leveldb_database.h
+++ b/content/browser/indexed_db/leveldb/leveldb_database.h
@@ -5,6 +5,7 @@
 #ifndef CONTENT_BROWSER_INDEXED_DB_LEVELDB_LEVELDB_DATABASE_H_
 #define CONTENT_BROWSER_INDEXED_DB_LEVELDB_LEVELDB_DATABASE_H_
 
+#include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
diff --git a/content/browser/indexed_db/leveldb/leveldb_slice.h b/content/browser/indexed_db/leveldb/leveldb_slice.h
index cb38bec..97aaba2 100644
--- a/content/browser/indexed_db/leveldb/leveldb_slice.h
+++ b/content/browser/indexed_db/leveldb/leveldb_slice.h
@@ -5,6 +5,7 @@
 #ifndef CONTENT_BROWSER_INDEXED_DB_LEVELDB_LEVELDB_SLICE_H_
 #define CONTENT_BROWSER_INDEXED_DB_LEVELDB_LEVELDB_SLICE_H_
 
+#include <string>
 #include <vector>
 
 #include "base/logging.h"
diff --git a/content/browser/indexed_db/leveldb/leveldb_transaction.cc b/content/browser/indexed_db/leveldb/leveldb_transaction.cc
index 332341e..11f792d 100644
--- a/content/browser/indexed_db/leveldb/leveldb_transaction.cc
+++ b/content/browser/indexed_db/leveldb/leveldb_transaction.cc
@@ -4,6 +4,8 @@
 
 #include "content/browser/indexed_db/leveldb/leveldb_transaction.h"
 
+#include <string>
+
 #include "base/logging.h"
 #include "content/browser/indexed_db/leveldb/leveldb_database.h"
 #include "content/browser/indexed_db/leveldb/leveldb_slice.h"
diff --git a/content/browser/indexed_db/leveldb/leveldb_transaction.h b/content/browser/indexed_db/leveldb/leveldb_transaction.h
index 10d5097..9ff8124 100644
--- a/content/browser/indexed_db/leveldb/leveldb_transaction.h
+++ b/content/browser/indexed_db/leveldb/leveldb_transaction.h
@@ -6,6 +6,7 @@
 #define CONTENT_BROWSER_INDEXED_DB_LEVELDB_LEVELDB_TRANSACTION_H_
 
 #include <set>
+#include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
diff --git a/content/browser/indexed_db/list_set_unittest.cc b/content/browser/indexed_db/list_set_unittest.cc
index 4e610e2..1bfafa2 100644
--- a/content/browser/indexed_db/list_set_unittest.cc
+++ b/content/browser/indexed_db/list_set_unittest.cc
@@ -95,8 +95,8 @@ TEST(ListSetTest, ListSetPrimitive) {
 template <typename T>
 class Wrapped {
  public:
-  Wrapped(const T& value) : value_(value) {}
-  Wrapped(const Wrapped<T>& other) : value_(other.value_) {}
+  explicit Wrapped(const T& value) : value_(value) {}
+  explicit Wrapped(const Wrapped<T>& other) : value_(other.value_) {}
   Wrapped& operator=(const Wrapped<T>& rhs) {
     value_ = rhs.value_;
     return *this;
@@ -188,7 +188,7 @@ TEST(ListSetTest, ListSetPointer) {
 template <typename T>
 class RefCounted : public base::RefCounted<RefCounted<T> > {
  public:
-  RefCounted(const T& value) : value_(value) {}
+  explicit RefCounted(const T& value) : value_(value) {}
   T value() { return value_; }
 
  private: