| Index: chrome/installer/mac/app/testing/OmahaXMLRequest_test.mm
|
| diff --git a/chrome/installer/mac/app/testing/OmahaXMLRequest_test.mm b/chrome/installer/mac/app/testing/OmahaXMLRequest_test.mm
|
| index a0f285ef7cc94dd0c5d7fd28796790d541c889f2..a7b775b36f5e04af08d1e463df9c34c32e81628c 100644
|
| --- a/chrome/installer/mac/app/testing/OmahaXMLRequest_test.mm
|
| +++ b/chrome/installer/mac/app/testing/OmahaXMLRequest_test.mm
|
| @@ -4,21 +4,24 @@
|
|
|
| #import "chrome/installer/mac/app/OmahaXMLRequest.h"
|
|
|
| +#include "base/base_paths.h"
|
| +#include "base/files/file_path.h"
|
| #include "base/mac/scoped_nsobject.h"
|
| #include "base/macros.h"
|
| +#include "base/path_service.h"
|
| +#include "base/strings/sys_string_conversions.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace {
|
|
|
| TEST(OmahaXMLRequestTest, CreateReturnsValidXML) {
|
| - base::scoped_nsobject<NSXMLDocument> xml_body_(
|
| - [OmahaXMLRequest createXMLRequestBody]);
|
| + NSXMLDocument* xml_body_ = [OmahaXMLRequest createXMLRequestBody];
|
| ASSERT_TRUE(xml_body_);
|
|
|
| - NSString* requestDTDLocation = [[[[NSBundle mainBundle] bundlePath]
|
| - stringByAppendingPathComponent:
|
| - @"../../chrome/installer/mac/app/testing/requestCheck.dtd"]
|
| - stringByResolvingSymlinksInPath];
|
| + base::FilePath path;
|
| + PathService::Get(base::DIR_SOURCE_ROOT, &path);
|
| + path = path.AppendASCII("chrome/test/data/mac_installer/requestCheck.dtd");
|
| + NSString* requestDTDLocation = base::SysUTF8ToNSString(path.value());
|
| NSData* requestDTDData = [NSData dataWithContentsOfFile:requestDTDLocation];
|
| ASSERT_TRUE(requestDTDData);
|
|
|
|
|