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

Unified Diff: chrome/browser/extensions/api/dial/dial_service.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
Index: chrome/browser/extensions/api/dial/dial_service.cc
diff --git a/chrome/browser/extensions/api/dial/dial_service.cc b/chrome/browser/extensions/api/dial/dial_service.cc
index fd86783ab45f3a602f43a68cb5554c9f32e8e014..7dd8ece7c1172c663c18794fdc3229cc066b3a74 100644
--- a/chrome/browser/extensions/api/dial/dial_service.cc
+++ b/chrome/browser/extensions/api/dial/dial_service.cc
@@ -19,7 +19,7 @@
#include "base/thread_task_runner_handle.h"
#include "base/time/time.h"
#include "chrome/browser/extensions/api/dial/dial_device_data.h"
-#include "chrome/common/chrome_version_info.h"
+#include "components/version_info/version_info.h"
#include "content/public/browser/browser_thread.h"
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
@@ -90,7 +90,6 @@ bool GetHeader(HttpResponseHeaders* headers, const char* name,
// Returns the request string.
std::string BuildRequest() {
// Extra line at the end to make UPnP lib happy.
- chrome::VersionInfo version;
std::string request(base::StringPrintf(
"M-SEARCH * HTTP/1.1\r\n"
"HOST: %s:%u\r\n"
@@ -103,9 +102,9 @@ std::string BuildRequest() {
kDialRequestPort,
kDialMaxResponseDelaySecs,
kDialSearchType,
- version.Name().c_str(),
- version.Version().c_str(),
- version.OSType().c_str()));
+ version_info::GetProductName().c_str(),
+ version_info::GetVersionNumber().c_str(),
+ version_info::GetOSType().c_str()));
// 1500 is a good MTU value for most Ethernet LANs.
DCHECK(request.size() <= 1500);
return request;

Powered by Google App Engine
This is Rietveld 408576698