IndexedDB + Coding Style: re-order enums/typedefs/... to match guide

content/browser/indexed_db/indexed_db_dispatcher_host.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DISPATCHER_HOST_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 86 matching lines @@
   void HoldBlobDataHandle(
       const std::string& uuid,
       scoped_ptr<webkit_blob::BlobDataHandle> blob_data_handle);
   void DropBlobDataHandle(const std::string& uuid);
 
  private:
   // Friends to enable OnDestruct() delegation.
   friend class BrowserThread;
   friend class base::DeleteHelper<IndexedDBDispatcherHost>;
 
-  virtual ~IndexedDBDispatcherHost();
+  // Used in nested classes.
+  typedef std::map<int32, GURL> WebIDBObjectIDToURLMap;
 
-  // Message processing. Most of the work is delegated to the dispatcher hosts
-  // below.
-  void OnIDBFactoryGetDatabaseNames(
-      const IndexedDBHostMsg_FactoryGetDatabaseNames_Params& p);
-  void OnIDBFactoryOpen(const IndexedDBHostMsg_FactoryOpen_Params& p);
-
-  void OnIDBFactoryDeleteDatabase(
-      const IndexedDBHostMsg_FactoryDeleteDatabase_Params& p);
-
-  void OnAckReceivedBlobs(const std::vector<std::string>& uuids);
-  void OnPutHelper(const IndexedDBHostMsg_DatabasePut_Params& params,
-                   std::vector<webkit_blob::BlobDataHandle*> handles);
-
-  void ResetDispatcherHosts();
+  typedef std::map<int64, GURL> TransactionIDToURLMap;

[cmumford, 2014/08/20 19:43:05]

alphabetical?

[jsbell, 2014/08/22 20:50:01]

Hrm... well, I went ahead and sorted these lines by the typedef name. But they
could also be sorted as whole lines. Not sure it's a huge win, but whatever.

+  typedef std::map<int64, uint64> TransactionIDToSizeMap;
+  typedef std::map<int64, int64> TransactionIDToDatabaseIDMap;
+  typedef std::map<std::string, webkit_blob::BlobDataHandle*> BlobDataHandleMap;
 
   // IDMap for RefCounted types
   template <typename RefCountedType>
   class RefIDMap {
-   private:
+   public:
     typedef int32 KeyType;
 
-   public:
     RefIDMap() {}
     ~RefIDMap() {}
 
     KeyType Add(RefCountedType* data) {
       return map_.Add(new scoped_refptr<RefCountedType>(data));
     }
 
     RefCountedType* Lookup(KeyType id) {
       scoped_refptr<RefCountedType>* ptr = map_.Lookup(id);
       if (ptr == NULL)
         return NULL;
       return ptr->get();
     }
 
     void Remove(KeyType id) { map_.Remove(id); }
 
     void set_check_on_null_data(bool value) {
       map_.set_check_on_null_data(value);
     }
 
    private:
     IDMap<scoped_refptr<RefCountedType>, IDMapOwnPointer> map_;
 
     DISALLOW_COPY_AND_ASSIGN(RefIDMap);
   };
 
-  // Helper templates.
-  template <class ReturnType>
-  ReturnType* GetOrTerminateProcess(IDMap<ReturnType, IDMapOwnPointer>* map,
-                                    int32 ipc_return_object_id);
-  template <class ReturnType>
-  ReturnType* GetOrTerminateProcess(RefIDMap<ReturnType>* map,
-                                    int32 ipc_return_object_id);
-
-  template <typename MapType>
-  void DestroyObject(MapType* map, int32 ipc_object_id);
-
-  // Used in nested classes.
-  typedef std::map<int32, GURL> WebIDBObjectIDToURLMap;
-
-  typedef std::map<int64, GURL> TransactionIDToURLMap;
-  typedef std::map<int64, uint64> TransactionIDToSizeMap;
-  typedef std::map<int64, int64> TransactionIDToDatabaseIDMap;
-
   class DatabaseDispatcherHost {
    public:
     explicit DatabaseDispatcherHost(IndexedDBDispatcherHost* parent);
     ~DatabaseDispatcherHost();
 
     void CloseAll();
     bool OnMessageReceived(const IPC::Message& message);
 
     void OnCreateObjectStore(
         const IndexedDBHostMsg_DatabaseCreateObjectStore_Params& params);
@@ skipping 72 matching lines @@
                          int unused_prefetches);
     void OnDestroyed(int32 ipc_cursor_id);
 
     IndexedDBDispatcherHost* parent_;
     RefIDMap<IndexedDBCursor> map_;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(CursorDispatcherHost);
   };
 
+  virtual ~IndexedDBDispatcherHost();
+
+  // Helper templates.
+  template <class ReturnType>
+  ReturnType* GetOrTerminateProcess(IDMap<ReturnType, IDMapOwnPointer>* map,
+                                    int32 ipc_return_object_id);
+  template <class ReturnType>
+  ReturnType* GetOrTerminateProcess(RefIDMap<ReturnType>* map,
+                                    int32 ipc_return_object_id);
+
+  template <typename MapType>
+  void DestroyObject(MapType* map, int32 ipc_object_id);
+
+  // Message processing. Most of the work is delegated to the dispatcher hosts
+  // below.
+  void OnIDBFactoryGetDatabaseNames(
+      const IndexedDBHostMsg_FactoryGetDatabaseNames_Params& p);
+  void OnIDBFactoryOpen(const IndexedDBHostMsg_FactoryOpen_Params& p);
+
+  void OnIDBFactoryDeleteDatabase(
+      const IndexedDBHostMsg_FactoryDeleteDatabase_Params& p);
+
+  void OnAckReceivedBlobs(const std::vector<std::string>& uuids);
+  void OnPutHelper(const IndexedDBHostMsg_DatabasePut_Params& params,
+                   std::vector<webkit_blob::BlobDataHandle*> handles);
+
+  void ResetDispatcherHosts();
+
   // The getter holds the context until OnChannelConnected() can be called from
   // the IO thread, which will extract the net::URLRequestContext from it.
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   net::URLRequestContext* request_context_;
   scoped_refptr<IndexedDBContextImpl> indexed_db_context_;
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
-
-  typedef std::map<std::string, webkit_blob::BlobDataHandle*> BlobDataHandleMap;
   BlobDataHandleMap blob_data_handle_map_;
 
   // Only access on IndexedDB thread.
   scoped_ptr<DatabaseDispatcherHost> database_dispatcher_host_;
   scoped_ptr<CursorDispatcherHost> cursor_dispatcher_host_;
 
   // Used to set file permissions for blob storage.
   int ipc_process_id_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DISPATCHER_HOST_H_