Merge 175642 (also includes 175980)

chrome/test/base/v8_unit_test.cc

 // Copyright (c) 2011 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/test/base/v8_unit_test.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
@@ skipping 50 matching lines @@
            user_libraries_.begin();
        user_libraries_iterator != user_libraries_.end();
        ++user_libraries_iterator) {
     std::string library_content;
     FilePath library_file(*user_libraries_iterator);
     if (!user_libraries_iterator->IsAbsolute()) {
       FilePath gen_file = gen_test_data_directory.Append(library_file);
       library_file = file_util::PathExists(gen_file) ? gen_file :
           test_data_directory.Append(*user_libraries_iterator);
     }
+    file_util::AbsolutePath(&library_file);
     if (!file_util::ReadFileToString(library_file, &library_content)) {
       ADD_FAILURE() << library_file.value();
       return false;
     }
     ExecuteScriptInContext(library_content, library_file.MaybeAsASCII());
     if (::testing::Test::HasFatalFailure())
       return false;
   }
   return true;
 }
@@ skipping 182 matching lines @@
   EXPECT_EQ(2U, testResult->Length());
   if (::testing::Test::HasNonfatalFailure())
     return v8::Undefined();
   testResult_ok = testResult->Get(0)->BooleanValue();
   if (!testResult_ok) {
     v8::String::Utf8Value message(testResult->Get(1));
     LOG(ERROR) << *message;
   }
   return v8::Undefined();
 }