Use STATIC_CONST_MEMBER_DEFINITION to make constant definitions clearer.

This is a followup to http://crrev.com/282419 .

BUG=none
TEST=none

Review URL: https://codereview.chromium.org/383863002

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

content/browser/storage_partition_impl.cc

@@ -192,19 +192,32 @@ void ClearSessionStorageOnUIThread(
 }  // namespace
 
 // static
-const uint32 StoragePartition::REMOVE_DATA_MASK_APPCACHE        = 1 << 0;
-const uint32 StoragePartition::REMOVE_DATA_MASK_COOKIES         = 1 << 1;
-const uint32 StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS    = 1 << 2;
-const uint32 StoragePartition::REMOVE_DATA_MASK_INDEXEDDB       = 1 << 3;
-const uint32 StoragePartition::REMOVE_DATA_MASK_LOCAL_STORAGE   = 1 << 4;
-const uint32 StoragePartition::REMOVE_DATA_MASK_SHADER_CACHE    = 1 << 5;
-const uint32 StoragePartition::REMOVE_DATA_MASK_WEBSQL          = 1 << 6;
-const uint32 StoragePartition::REMOVE_DATA_MASK_WEBRTC_IDENTITY = 1 << 7;
-const uint32 StoragePartition::REMOVE_DATA_MASK_ALL         = 0xFFFFFFFF;
-const uint32 StoragePartition::QUOTA_MANAGED_STORAGE_MASK_TEMPORARY  = 1 << 0;
-const uint32 StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT = 1 << 1;
-const uint32 StoragePartition::QUOTA_MANAGED_STORAGE_MASK_SYNCABLE   = 1 << 2;
-const uint32 StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL    = 0xFFFFFFFF;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::REMOVE_DATA_MASK_APPCACHE;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::REMOVE_DATA_MASK_COOKIES;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::REMOVE_DATA_MASK_INDEXEDDB;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::REMOVE_DATA_MASK_LOCAL_STORAGE;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::REMOVE_DATA_MASK_SHADER_CACHE;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::REMOVE_DATA_MASK_WEBSQL;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::REMOVE_DATA_MASK_WEBRTC_IDENTITY;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::REMOVE_DATA_MASK_ALL;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::QUOTA_MANAGED_STORAGE_MASK_TEMPORARY;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::QUOTA_MANAGED_STORAGE_MASK_PERSISTENT;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::QUOTA_MANAGED_STORAGE_MASK_SYNCABLE;
+STATIC_CONST_MEMBER_DEFINITION const uint32
+    StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL;
 
 // Static.
 int StoragePartitionImpl::GenerateQuotaClientMask(uint32 remove_mask) {

content/public/browser/storage_partition.h

@@ -63,23 +63,23 @@ class CONTENT_EXPORT StoragePartition {
   virtual IndexedDBContext* GetIndexedDBContext() = 0;
   virtual ServiceWorkerContext* GetServiceWorkerContext() = 0;
 
-  static const uint32 REMOVE_DATA_MASK_APPCACHE;
-  static const uint32 REMOVE_DATA_MASK_COOKIES;
-  static const uint32 REMOVE_DATA_MASK_FILE_SYSTEMS;
-  static const uint32 REMOVE_DATA_MASK_INDEXEDDB;
-  static const uint32 REMOVE_DATA_MASK_LOCAL_STORAGE;
-  static const uint32 REMOVE_DATA_MASK_SHADER_CACHE;
-  static const uint32 REMOVE_DATA_MASK_WEBSQL;
-  static const uint32 REMOVE_DATA_MASK_WEBRTC_IDENTITY;
-  static const uint32 REMOVE_DATA_MASK_ALL;
+  static const uint32 REMOVE_DATA_MASK_APPCACHE        = 1 << 0;
+  static const uint32 REMOVE_DATA_MASK_COOKIES         = 1 << 1;
+  static const uint32 REMOVE_DATA_MASK_FILE_SYSTEMS    = 1 << 2;
+  static const uint32 REMOVE_DATA_MASK_INDEXEDDB       = 1 << 3;
+  static const uint32 REMOVE_DATA_MASK_LOCAL_STORAGE   = 1 << 4;
+  static const uint32 REMOVE_DATA_MASK_SHADER_CACHE    = 1 << 5;
+  static const uint32 REMOVE_DATA_MASK_WEBSQL          = 1 << 6;
+  static const uint32 REMOVE_DATA_MASK_WEBRTC_IDENTITY = 1 << 7;
+  static const uint32 REMOVE_DATA_MASK_ALL             = 0xFFFFFFFF;
 
   // Corresponds to quota::kStorageTypeTemporary.
-  static const uint32 QUOTA_MANAGED_STORAGE_MASK_TEMPORARY;
+  static const uint32 QUOTA_MANAGED_STORAGE_MASK_TEMPORARY  = 1 << 0;
   // Corresponds to quota::kStorageTypePersistent.
-  static const uint32 QUOTA_MANAGED_STORAGE_MASK_PERSISTENT;
+  static const uint32 QUOTA_MANAGED_STORAGE_MASK_PERSISTENT = 1 << 1;
   // Corresponds to quota::kStorageTypeSyncable.
-  static const uint32 QUOTA_MANAGED_STORAGE_MASK_SYNCABLE;
-  static const uint32 QUOTA_MANAGED_STORAGE_MASK_ALL;
+  static const uint32 QUOTA_MANAGED_STORAGE_MASK_SYNCABLE   = 1 << 2;
+  static const uint32 QUOTA_MANAGED_STORAGE_MASK_ALL        = 0xFFFFFFFF;
 
   // Starts an asynchronous task that does a best-effort clear the data
   // corresponding to the given |remove_mask| and |quota_storage_remove_mask|