Index: chrome/service/cloud_print/cloud_print_service_helpers_unittest.cc |
diff --git a/chrome/service/cloud_print/cloud_print_service_helpers_unittest.cc b/chrome/service/cloud_print/cloud_print_service_helpers_unittest.cc |
index 379cb4cbca42f920473a1944b0f28831cfac8108..761e18f4e58a3387f40e3cd89b7b04b2b1add841 100644 |
--- a/chrome/service/cloud_print/cloud_print_service_helpers_unittest.cc |
+++ b/chrome/service/cloud_print/cloud_print_service_helpers_unittest.cc |
@@ -7,7 +7,7 @@ |
#include "base/md5.h" |
#include "base/strings/stringprintf.h" |
#include "base/sys_info.h" |
-#include "chrome/common/chrome_version_info.h" |
+#include "chrome/common/channel_info.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace cloud_print { |
@@ -53,10 +53,9 @@ TEST(CloudPrintServiceHelpersTest, GetHashOfPrinterInfo) { |
printer_info.options["tag1"] = std::string("value1"); |
printer_info.options["tag2"] = std::string("value2"); |
- chrome::VersionInfo version_info; |
std::string expected_list_string = base::StringPrintf( |
"chrome_version%ssystem_name%ssystem_version%stag1value1tag2value2", |
- version_info.CreateVersionString().c_str(), |
+ chrome::GetVersionString().c_str(), |
base::SysInfo::OperatingSystemName().c_str(), |
base::SysInfo::OperatingSystemVersion().c_str()); |
EXPECT_EQ(base::MD5String(expected_list_string), |
@@ -68,7 +67,6 @@ TEST(CloudPrintServiceHelpersTest, GetPostDataForPrinterInfo) { |
printer_info.options["tag1"] = std::string("value1"); |
printer_info.options["tag2"] = std::string("value2"); |
- chrome::VersionInfo version_info; |
std::string expected = base::StringPrintf( |
"--test_mime_boundary\r\nContent-Disposition: form-data; name=\"tag\"" |
"\r\n\r\n__cp__chrome_version=%s\r\n" |
@@ -82,7 +80,7 @@ TEST(CloudPrintServiceHelpersTest, GetPostDataForPrinterInfo) { |
"\r\n\r\n__cp__tag2=value2\r\n" |
"--test_mime_boundary\r\nContent-Disposition: form-data; name=\"tag\"" |
"\r\n\r\n__cp__tagshash=%s\r\n", |
- version_info.CreateVersionString().c_str(), |
+ chrome::GetVersionString().c_str(), |
base::SysInfo::OperatingSystemName().c_str(), |
base::SysInfo::OperatingSystemVersion().c_str(), |
GetHashOfPrinterInfo(printer_info).c_str()); |