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

chrome/browser/extensions/extensions_service_unittest.cc

 // Copyright (c) 2006-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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 524 matching lines @@
   EXPECT_EQ(3u, scripts[0].url_patterns().size());
   EXPECT_EQ("file://*",
             scripts[0].url_patterns()[0].GetAsString());
   EXPECT_EQ("http://*.google.com/*",
             scripts[0].url_patterns()[1].GetAsString());
   EXPECT_EQ("https://*.google.com/*",
             scripts[0].url_patterns()[2].GetAsString());
   EXPECT_EQ(2u, scripts[0].js_scripts().size());
   ExtensionResource resource00(scripts[0].js_scripts()[0].extension_root(),
                                scripts[0].js_scripts()[0].relative_path());
-  EXPECT_TRUE(resource00.ComparePathWithDefault(
-      extension->path().AppendASCII("script1.js")));
+  FilePath expected_path(extension->path().AppendASCII("script1.js"));
+  ASSERT_TRUE(file_util::AbsolutePath(&expected_path));
+  EXPECT_TRUE(resource00.ComparePathWithDefault(expected_path));
   ExtensionResource resource01(scripts[0].js_scripts()[1].extension_root(),
                                scripts[0].js_scripts()[1].relative_path());
-  EXPECT_TRUE(resource01.ComparePathWithDefault(
-      extension->path().AppendASCII("script2.js")));
+  expected_path = extension->path().AppendASCII("script2.js");
+  ASSERT_TRUE(file_util::AbsolutePath(&expected_path));
+  EXPECT_TRUE(resource01.ComparePathWithDefault(expected_path));
   EXPECT_TRUE(extension->plugins().empty());
   EXPECT_EQ(1u, scripts[1].url_patterns().size());
   EXPECT_EQ("http://*.news.com/*", scripts[1].url_patterns()[0].GetAsString());
   ExtensionResource resource10(scripts[1].js_scripts()[0].extension_root(),
                                scripts[1].js_scripts()[0].relative_path());
-  EXPECT_TRUE(resource10.ComparePathWithDefault(
-      extension->path().AppendASCII("js_files").AppendASCII("script3.js")));
+  expected_path =
+      extension->path().AppendASCII("js_files").AppendASCII("script3.js");
+  ASSERT_TRUE(file_util::AbsolutePath(&expected_path));
+  EXPECT_TRUE(resource10.ComparePathWithDefault(expected_path));
   const std::vector<URLPattern> permissions = extension->host_permissions();
   ASSERT_EQ(2u, permissions.size());
   EXPECT_EQ("http://*.google.com/*", permissions[0].GetAsString());
   EXPECT_EQ("https://*.google.com/*", permissions[1].GetAsString());
   ASSERT_EQ(2u, toolstrips.size());
   EXPECT_EQ(extension->GetResourceURL("toolstrip1.html"),
             toolstrips[0].toolstrip);
   EXPECT_EQ(extension->GetResourceURL("lorem_ipsum.html"),
             toolstrips[0].mole);
   EXPECT_EQ(200, toolstrips[0].mole_height);
@@ skipping 994 matching lines @@
 
   recorder.set_ready(false);
   command_line.reset(new CommandLine(CommandLine::ARGUMENTS_ONLY));
   service = new ExtensionsService(&profile, command_line.get(),
       profile.GetPrefs(), install_dir, &loop, &loop, false);
   EXPECT_FALSE(service->extensions_enabled());
   service->Init();
   loop.RunAllPending();
   EXPECT_TRUE(recorder.ready());
 }