chrome/common/cloud_print/cloud_print_helpers_unittest.cc - Issue 1269773002: Cleanup VersionInfo after componentization.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/cloud_print/cloud_print_helpers_unittest.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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

« chrome/browser/web_applications/web_app.cc ('K') | « chrome/common/cloud_print/cloud_print_helpers.cc ('k') | chrome/common/extensions/api/storage/storage_schema_manifest_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/cloud_print/cloud_print_helpers_unittest.cc

diff --git a/chrome/common/cloud_print/cloud_print_helpers_unittest.cc b/chrome/common/cloud_print/cloud_print_helpers_unittest.cc

index 662ee5847f4a513adc7b5e8a131e8f94b3ddd008..41b8f982c1a2ec6da459e6e24b18262f2cb64595 100644

--- a/chrome/common/cloud_print/cloud_print_helpers_unittest.cc

+++ b/chrome/common/cloud_print/cloud_print_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"

#include "url/gurl.h"

@@ -83,10 +83,9 @@ TEST(CloudPrintHelpersTest, GetHashOfPrinterTags) {

printer_tags["tag1"] = std::string("value1");

printer_tags["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),

@@ -98,7 +97,6 @@ TEST(CloudPrintHelpersTest, GetPostDataForPrinterTags) {

printer_tags["tag1"] = std::string("value1");

printer_tags["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__test__chrome_version=%s\r\n"

@@ -112,7 +110,7 @@ TEST(CloudPrintHelpersTest, GetPostDataForPrinterTags) {

"\r\n\r\n__test__tag2=value2\r\n"

"--test_mime_boundary\r\nContent-Disposition: form-data; name=\"tag\""

"\r\n\r\n__test__tagshash=%s\r\n",

- version_info.CreateVersionString().c_str(),

+ chrome::GetVersionString().c_str(),

base::SysInfo::OperatingSystemName().c_str(),

base::SysInfo::OperatingSystemVersion().c_str(),

GetHashOfPrinterTags(printer_tags).c_str());