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 18 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";
-
-#if defined(OS_CHROMEOS)
-const char kMountPointsKey[] = "mount_points";
-#endif  // defined(OS_CHROMEOS)
+const char kStoragePartitionMapKeyName[] = "content_storage_partition_map";
 
 StoragePartitionImplMap* GetStoragePartitionMap(
     BrowserContext* browser_context) {
   StoragePartitionImplMap* partition_map =
       static_cast<StoragePartitionImplMap*>(
-          browser_context->GetUserData(kStorageParitionMapKeyName));
+          browser_context->GetUserData(kStoragePartitionMapKeyName));
   if (!partition_map) {
     partition_map = new StoragePartitionImplMap(browser_context);
-    browser_context->SetUserData(kStorageParitionMapKeyName, partition_map);
+    browser_context->SetUserData(kStoragePartitionMapKeyName, 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 75 matching lines @@
 
 // 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)
+  const char kMountPointsKey[] = "mount_points";

[davidben, 2015/08/14 21:18:34]

This miiiiight accidentally work, but only because the compiler will likely
allocate the string literal in .rodata rather than put it on stack or something.

GetUserData requires that the value be the same each time. In fact, the string
is irrelevant and is mostly a debugging aid I think? (Actually I think we
usually use a slightly different pattern these days since the compiler might try
to globally deduplicate string pointers across compilation units?)

Anyway, it's the value of the pointer that's significant, not the string, and
that value needs to be the same across calls. Let's just put that back. If we
want it revised further, we'll do a separate CL.

   if (!context->GetUserData(kMountPointsKey)) {
     scoped_refptr<storage::ExternalMountPoints> mount_points =
         storage::ExternalMountPoints::CreateRefCounted();
     context->SetUserData(
         kMountPointsKey,
         new UserDataAdapter<storage::ExternalMountPoints>(mount_points.get()));
   }
 
   return UserDataAdapter<storage::ExternalMountPoints>::Get(context,
                                                             kMountPointsKey);
@@ skipping 34 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(kStoragePartitionMapKeyName));
   if (!partition_map)
     return;
 
   partition_map->ForEach(callback);
 }
 
 StoragePartition* BrowserContext::GetDefaultStoragePartition(
     BrowserContext* browser_context) {
   return GetStoragePartition(browser_context, NULL);
 }
@@ skipping 108 matching lines @@
 #endif  // !OS_IOS
 
 BrowserContext::~BrowserContext() {
 #if !defined(OS_IOS)
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 #endif
 }
 
 }  // namespace content