Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6040)

Unified Diff: chrome/installer/mac/app/testing/OmahaXMLRequest_test.mm

Issue 2203583002: Added unpacking step (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved comments, made many minor changes, ready for review! Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..fc50f6b7c3644b051f62ed7f8202fd6223dd41ec 100644
--- a/chrome/installer/mac/app/testing/OmahaXMLRequest_test.mm
+++ b/chrome/installer/mac/app/testing/OmahaXMLRequest_test.mm
@@ -4,8 +4,12 @@
#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 {
@@ -15,10 +19,10 @@ TEST(OmahaXMLRequestTest, CreateReturnsValidXML) {
[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);

Powered by Google App Engine
This is Rietveld 408576698