Make ExtensionPrefs paths relative, re-enable 2 ExtensionsService unit_tests

chrome/common/extensions/extension.cc

 // Copyright (c) 2009 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/common/extensions/extension.h"
 
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 471 matching lines @@
   GURL file_url = extension_url.ReplaceComponents(replacements);
   if (!file_url.is_valid())
     return FilePath();
 
   // Convert the result back to a FilePath.
   FilePath ret_val;
   if (!net::FileURLToFilePath(file_url, &ret_val))
     return FilePath();
 
   // Double-check that the path we ended up with is actually inside the
-  // extension root. We can do this with a simple prefix match because:
-  // a) We control the prefix on both sides, and they should match.
-  // b) GURL normalizes things like "../" and "//" before it gets to us.
-  if (ret_val.value().find(extension_path.value() +
-                           FilePath::kSeparators[0]) != 0)
+  // extension root.
+  if (!extension_path.IsParent(ret_val))
     return FilePath();
 
   return ret_val;
 }
 
 Extension::Extension(const FilePath& path) {
   DCHECK(path.IsAbsolute());
   location_ = INVALID;
 
 #if defined(OS_WIN)
@@ skipping 425 matching lines @@
     }
   }
 
   for (PageActionMap::const_iterator it = page_actions().begin();
        it != page_actions().end(); ++it) {
     image_paths.insert(it->second->icon_path());
   }
 
   return image_paths;
 }