Fixing variable name typo ('Parition' -> Partition).

content/browser/browser_context.cc

 // 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.
 
 #include "content/public/browser/browser_context.h"
 
 #if !defined(OS_IOS)
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
@@ skipping 17 matching lines @@
 
 using base::UserDataAdapter;
 
 namespace content {
 
 // Only ~BrowserContext() is needed on iOS.
 #if !defined(OS_IOS)
 namespace {
 
 // Key names on BrowserContext.
-const char kDownloadManagerKeyName[] = "download_manager";
-const char kStorageParitionMapKeyName[] = "content_storage_partition_map";
+const char *KeyNames[] { "download_manager", "content_storage_partition_map"

[davidben, 2015/08/14 20:24:39]

Style: * hugs the type

[davidben, 2015/08/14 20:24:39]

Style: kKeyNames

+#if defined(OS_CHROMEOS)
+  , "mount_points"

[davidben, 2015/08/14 20:24:39]

No reason to do the comma like this. Trailing commas are legal in arrays.

+#endif  // defined(OS_CHROMEOS)
+};
+enum KeyNameIndex { DOWNLOAD_MANAGER, STORAGE_PARTITION, MOUNT_POINTS };
 
-#if defined(OS_CHROMEOS)
-const char kMountPointsKey[] = "mount_points";
-#endif  // defined(OS_CHROMEOS)
 
 StoragePartitionImplMap* GetStoragePartitionMap(
     BrowserContext* browser_context) {
   StoragePartitionImplMap* partition_map =
       static_cast<StoragePartitionImplMap*>(
-          browser_context->GetUserData(kStorageParitionMapKeyName));
+          browser_context->GetUserData(KeyNames[STORAGE_PARTITION]));
   if (!partition_map) {
     partition_map = new StoragePartitionImplMap(browser_context);
-    browser_context->SetUserData(kStorageParitionMapKeyName, partition_map);
+    browser_context->SetUserData(KeyNames[STORAGE_PARTITION], partition_map);
   }
   return partition_map;
 }
 
 StoragePartition* GetStoragePartitionFromConfig(
     BrowserContext* browser_context,
     const std::string& partition_domain,
     const std::string& partition_name,
     bool in_memory) {
   StoragePartitionImplMap* partition_map =
@@ skipping 25 matching lines @@
   ServiceWorkerContextWrapper* wrapper =
       static_cast<ServiceWorkerContextWrapper*>(
           partition->GetServiceWorkerContext());
   wrapper->process_manager()->Shutdown();
 }
 
 void SetDownloadManager(BrowserContext* context,
                         content::DownloadManager* download_manager) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(download_manager);
-  context->SetUserData(kDownloadManagerKeyName, download_manager);
+  context->SetUserData(KeyNames[DOWNLOAD_MANAGER], download_manager);
 }
 
 }  // namespace
 
 // static
 void BrowserContext::AsyncObliterateStoragePartition(
     BrowserContext* browser_context,
     const GURL& site,
     const base::Closure& on_gc_required) {
   GetStoragePartitionMap(browser_context)->AsyncObliterate(site,
                                                            on_gc_required);
 }
 
 // static
 void BrowserContext::GarbageCollectStoragePartitions(
       BrowserContext* browser_context,
       scoped_ptr<base::hash_set<base::FilePath> > active_paths,
       const base::Closure& done) {
   GetStoragePartitionMap(browser_context)->GarbageCollect(
       active_paths.Pass(), done);
 }
 
 DownloadManager* BrowserContext::GetDownloadManager(
     BrowserContext* context) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (!context->GetUserData(kDownloadManagerKeyName)) {
+  if (!context->GetUserData(KeyNames[DOWNLOAD_MANAGER])) {
     ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
     DCHECK(rdh);
     DownloadManager* download_manager =
         new DownloadManagerImpl(
             GetContentClient()->browser()->GetNetLog(), context);
 
     SetDownloadManager(context, download_manager);
     download_manager->SetDelegate(context->GetDownloadManagerDelegate());
   }
 
   return static_cast<DownloadManager*>(
-      context->GetUserData(kDownloadManagerKeyName));
+      context->GetUserData(KeyNames[DOWNLOAD_MANAGER]));
 }
 
 // static
 storage::ExternalMountPoints* BrowserContext::GetMountPoints(
     BrowserContext* context) {
   // Ensure that these methods are called on the UI thread, except for
   // unittests where a UI thread might not have been created.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          !BrowserThread::IsMessageLoopValid(BrowserThread::UI));
 
 #if defined(OS_CHROMEOS)
-  if (!context->GetUserData(kMountPointsKey)) {
+  if (!context->GetUserData(KeyNames[MOUNT_POINTS])) {
     scoped_refptr<storage::ExternalMountPoints> mount_points =
         storage::ExternalMountPoints::CreateRefCounted();
     context->SetUserData(
-        kMountPointsKey,
+        KeyNames[MOUNT_POINTS],
         new UserDataAdapter<storage::ExternalMountPoints>(mount_points.get()));
   }
 
   return UserDataAdapter<storage::ExternalMountPoints>::Get(context,
-                                                            kMountPointsKey);
+                                                            KeyNames[MOUNT_POINTS]);

[davidben, 2015/08/14 20:24:39]

Style: 80 column limit.

 #else
   return NULL;
 #endif
 }
 
 StoragePartition* BrowserContext::GetStoragePartition(
     BrowserContext* browser_context,
     SiteInstance* site_instance) {
   std::string partition_domain;
   std::string partition_name;
@@ skipping 24 matching lines @@
 
   return GetStoragePartitionFromConfig(
       browser_context, partition_domain, partition_name, in_memory);
 }
 
 void BrowserContext::ForEachStoragePartition(
     BrowserContext* browser_context,
     const StoragePartitionCallback& callback) {
   StoragePartitionImplMap* partition_map =
       static_cast<StoragePartitionImplMap*>(
-          browser_context->GetUserData(kStorageParitionMapKeyName));
+          browser_context->GetUserData(KeyNames[STORAGE_PARTITION]));
   if (!partition_map)
     return;
 
   partition_map->ForEach(callback);
 }
 
 StoragePartition* BrowserContext::GetDefaultStoragePartition(
     BrowserContext* browser_context) {
   return GetStoragePartition(browser_context, NULL);
 }
@@ skipping 102 matching lines @@
 void BrowserContext::SetDownloadManagerForTesting(
     BrowserContext* browser_context,
     DownloadManager* download_manager) {
   SetDownloadManager(browser_context, download_manager);
 }
 
 #endif  // !OS_IOS
 
 BrowserContext::~BrowserContext() {
 #if !defined(OS_IOS)
-  if (GetUserData(kDownloadManagerKeyName))
+  if (GetUserData(KeyNames[DOWNLOAD_MANAGER]))
     GetDownloadManager(this)->Shutdown();
 #endif
 }
 
 }  // namespace content