Fix some more problems with windows paths in content verification

extensions/browser/verified_contents.cc

 // Copyright 2014 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 "extensions/browser/verified_contents.h"
 
 #include "base/base64.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/strings/string_util.h"
@@ skipping 167 matching lines @@
       std::string encoded_root_hash;
       std::string root_hash;
       if (!data->GetString(kPathKey, &file_path_string) ||
           !base::IsStringUTF8(file_path_string) ||
           !data->GetString(kRootHashKey, &encoded_root_hash) ||
           !FixupBase64Encoding(&encoded_root_hash) ||
           !base::Base64Decode(encoded_root_hash, &root_hash))
         return false;
       base::FilePath file_path =
           base::FilePath::FromUTF8Unsafe(file_path_string);
-#if defined(FILE_PATH_USES_WIN_SEPARATORS)
-      file_path = file_path.NormalizePathSeparators();
-#endif  // defined(FILE_PATH_USES_WIN_SEPARATORS)
       root_hashes_[file_path] = std::string();
       root_hashes_[file_path].swap(root_hash);
     }
 
     break;
   }
   return true;
 }
 
 const std::string* VerifiedContents::GetTreeHashRoot(
     const base::FilePath& relative_path) {
   std::map<base::FilePath, std::string>::const_iterator i =
-      root_hashes_.find(relative_path);
+      root_hashes_.find(relative_path.NormalizePathSeparatorsTo('/'));
   if (i == root_hashes_.end())
     return NULL;
   return &i->second;
 }
 
 // We're loosely following the "JSON Web Signature" draft spec for signing
 // a JSON payload:
 //
 //   http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-26
 //
@@ skipping 124 matching lines @@
       reinterpret_cast<const uint8*>(payload.data()), payload.size());
 
   if (!signature_verifier.VerifyFinal()) {
     VLOG(1) << "Could not verify signature - VerifyFinal failure";
     return false;
   }
   return true;
 }
 
 }  // namespace extensions