Get rid of FilePath::AppendAndResolveRelative()....

chrome/common/extensions/extension_resource_unittest.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 <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 17 matching lines @@
   return str;
 }
 
 TEST(ExtensionResourceTest, CreateWithMissingResourceOnDisk) {
   FilePath root_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &root_path));
   FilePath relative_path;
   relative_path = relative_path.AppendASCII("cira.js");
   ExtensionResource resource(root_path, relative_path);
 
+  // The path doesn't exist on disk, we will be returned an empty path.
   EXPECT_EQ(root_path.value(), resource.extension_root().value());
   EXPECT_EQ(relative_path.value(), resource.relative_path().value());
-  EXPECT_EQ(ToLower(root_path.Append(relative_path).value()),
-    ToLower(resource.GetFilePath().value()));
-
-  EXPECT_FALSE(resource.GetFilePath().empty());
+  EXPECT_TRUE(resource.GetFilePath().empty());
 }
 
 TEST(ExtensionResourceTest, CreateWithAllResourcesOnDisk) {
   ScopedTempDir temp;
   ASSERT_TRUE(temp.CreateUniqueTempDir());
 
   // Create resource in the extension root.
   const char* filename = "res.ico";
   FilePath root_resource = temp.path().AppendASCII(filename);
   std::string data = "some foo";
@@ skipping 15 matching lines @@
         data.c_str(), data.length()));
   }
 
   FilePath path;
   ExtensionResource resource(temp.path(), FilePath().AppendASCII(filename));
   FilePath resolved_path = resource.GetFilePath();
 
   ASSERT_FALSE(locales.empty());
   FilePath expected_path;
   expected_path = l10n_path.AppendASCII(locales[0]).AppendASCII(filename);
+  ASSERT_TRUE(file_util::AbsolutePath(&expected_path));
 
   EXPECT_EQ(ToLower(expected_path.value()), ToLower(resolved_path.value()));
   EXPECT_EQ(ToLower(temp.path().value()),
             ToLower(resource.extension_root().value()));
   EXPECT_EQ(ToLower(FilePath().AppendASCII(filename).value()),
             ToLower(resource.relative_path().value()));
 }