Clean up some old TODOs

chrome/browser/in_process_webkit/dom_storage_context.cc

 // Copyright (c) 2010 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 "chrome/browser/in_process_webkit/dom_storage_context.h"
 
 #include <algorithm>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 31 matching lines @@
 }
 
 }  // namespace
 
 const FilePath::CharType DOMStorageContext::kLocalStorageDirectory[] =
     FILE_PATH_LITERAL("Local Storage");
 
 const FilePath::CharType DOMStorageContext::kLocalStorageExtension[] =
     FILE_PATH_LITERAL(".localstorage");
 
-static const FilePath::CharType kLocalStorageOldPath[] =
-    FILE_PATH_LITERAL("localStorage");
-
-// TODO(jorlow): Remove after Chrome 4 ships.
-static void MigrateLocalStorageDirectory(const FilePath& data_path) {
-  FilePath new_path = data_path.Append(
-      DOMStorageContext::kLocalStorageDirectory);
-  FilePath old_path = data_path.Append(kLocalStorageOldPath);
-  if (!file_util::DirectoryExists(new_path) &&
-      file_util::DirectoryExists(old_path)) {
-    file_util::Move(old_path, new_path);
-  }
-}
-
 DOMStorageContext::DOMStorageContext(WebKitContext* webkit_context)
     : last_storage_area_id_(0),
       last_session_storage_namespace_id_on_ui_thread_(kLocalStorageNamespaceId),
       last_session_storage_namespace_id_on_io_thread_(kLocalStorageNamespaceId),
       clear_local_state_on_exit_(false) {
   data_path_ = webkit_context->data_path();
 }
 
 DOMStorageContext::~DOMStorageContext() {
   // This should not go away until all DOM Storage message filters have gone
@@ skipping 175 matching lines @@
       file_util::FileEnumerator::FILES);
   for (FilePath file_path = file_enumerator.Next(); !file_path.empty();
        file_path = file_enumerator.Next()) {
     if (file_path.Extension() == kLocalStorageExtension)
       file_util::Delete(file_path, false);
   }
 }
 
 DOMStorageNamespace* DOMStorageContext::CreateLocalStorage() {
   FilePath dir_path;
-  if (!data_path_.empty()) {
-    MigrateLocalStorageDirectory(data_path_);
+  if (!data_path_.empty())
     dir_path = data_path_.Append(kLocalStorageDirectory);
-  }
   DOMStorageNamespace* new_namespace =
       DOMStorageNamespace::CreateLocalStorageNamespace(this, dir_path);
   RegisterStorageNamespace(new_namespace);
   return new_namespace;
 }
 
 DOMStorageNamespace* DOMStorageContext::CreateSessionStorage(
     int64 namespace_id) {
   DOMStorageNamespace* new_namespace =
       DOMStorageNamespace::CreateSessionStorageNamespace(this, namespace_id);
@@ skipping 21 matching lines @@
 }
 
 FilePath DOMStorageContext::GetLocalStorageFilePath(
     const string16& origin_id) const {
   FilePath storageDir = data_path_.Append(
       DOMStorageContext::kLocalStorageDirectory);
   FilePath::StringType id =
       webkit_glue::WebStringToFilePathString(origin_id);
   return storageDir.Append(id.append(kLocalStorageExtension));
 }