Commit bddf57ca authored by Luke Halliwell's avatar Luke Halliwell Committed by Commit Bot

[Chromecast] Remove obsolete GetGl* functions from CastSysInfo

Merge-With: eureka-internal/247580

Bug: internal b/122743819
Test: None
Change-Id: Ib31702df4e94550813c2e7c20f60657ec179af1d
Reviewed-on: https://chromium-review.googlesource.com/c/1494802
Commit-Queue: Yuchen Liu <yucliu@chromium.org>
Auto-Submit: Luke Halliwell <halliwell@chromium.org>
Reviewed-by: default avatarYuchen Liu <yucliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636540}
parent cbaf986f
...@@ -130,19 +130,4 @@ std::string CastSysInfoAndroid::GetApInterface() { ...@@ -130,19 +130,4 @@ std::string CastSysInfoAndroid::GetApInterface() {
return ""; return "";
} }
std::string CastSysInfoAndroid::GetGlVendor() {
NOTREACHED() << "GL information shouldn't be requested on Android.";
return "";
}
std::string CastSysInfoAndroid::GetGlRenderer() {
NOTREACHED() << "GL information shouldn't be requested on Android.";
return "";
}
std::string CastSysInfoAndroid::GetGlVersion() {
NOTREACHED() << "GL information shouldn't be requested on Android.";
return "";
}
} // namespace chromecast } // namespace chromecast
...@@ -37,9 +37,6 @@ class CastSysInfoAndroid : public CastSysInfo { ...@@ -37,9 +37,6 @@ class CastSysInfoAndroid : public CastSysInfo {
std::string GetFactoryLocale(std::string* second_locale) override; std::string GetFactoryLocale(std::string* second_locale) override;
std::string GetWifiInterface() override; std::string GetWifiInterface() override;
std::string GetApInterface() override; std::string GetApInterface() override;
std::string GetGlVendor() override;
std::string GetGlRenderer() override;
std::string GetGlVersion() override;
private: private:
const base::android::BuildInfo* const build_info_; const base::android::BuildInfo* const build_info_;
......
...@@ -73,18 +73,6 @@ std::string CastSysInfoDummy::GetApInterface() { ...@@ -73,18 +73,6 @@ std::string CastSysInfoDummy::GetApInterface() {
return ap_interface_; return ap_interface_;
} }
std::string CastSysInfoDummy::GetGlVendor() {
return gl_vendor_;
}
std::string CastSysInfoDummy::GetGlRenderer() {
return gl_renderer_;
}
std::string CastSysInfoDummy::GetGlVersion() {
return gl_version_;
}
void CastSysInfoDummy::SetBuildTypeForTesting( void CastSysInfoDummy::SetBuildTypeForTesting(
CastSysInfo::BuildType build_type) { CastSysInfo::BuildType build_type) {
build_type_ = build_type; build_type_ = build_type;
...@@ -149,16 +137,4 @@ void CastSysInfoDummy::SetApInterfaceForTesting( ...@@ -149,16 +137,4 @@ void CastSysInfoDummy::SetApInterfaceForTesting(
ap_interface_ = ap_interface; ap_interface_ = ap_interface;
} }
void CastSysInfoDummy::SetGlVendorForTesting(const std::string& gl_vendor) {
gl_vendor_ = gl_vendor;
}
void CastSysInfoDummy::SetGlRendererForTesting(const std::string& gl_renderer) {
gl_renderer_ = gl_renderer;
}
void CastSysInfoDummy::SetGlVersionForTesting(const std::string& gl_version) {
gl_version_ = gl_version;
}
} // namespace chromecast } // namespace chromecast
...@@ -32,9 +32,6 @@ class CastSysInfoDummy : public CastSysInfo { ...@@ -32,9 +32,6 @@ class CastSysInfoDummy : public CastSysInfo {
std::string GetFactoryLocale(std::string* second_locale) override; std::string GetFactoryLocale(std::string* second_locale) override;
std::string GetWifiInterface() override; std::string GetWifiInterface() override;
std::string GetApInterface() override; std::string GetApInterface() override;
std::string GetGlVendor() override;
std::string GetGlRenderer() override;
std::string GetGlVersion() override;
void SetBuildTypeForTesting(BuildType build_type); void SetBuildTypeForTesting(BuildType build_type);
void SetSystemReleaseChannelForTesting( void SetSystemReleaseChannelForTesting(
...@@ -50,9 +47,6 @@ class CastSysInfoDummy : public CastSysInfo { ...@@ -50,9 +47,6 @@ class CastSysInfoDummy : public CastSysInfo {
void SetFactoryLocaleForTesting(const std::string& factory_locale); void SetFactoryLocaleForTesting(const std::string& factory_locale);
void SetWifiInterfaceForTesting(const std::string& wifi_interface); void SetWifiInterfaceForTesting(const std::string& wifi_interface);
void SetApInterfaceForTesting(const std::string& ap_interface); void SetApInterfaceForTesting(const std::string& ap_interface);
void SetGlVendorForTesting(const std::string& gl_vendor);
void SetGlRendererForTesting(const std::string& gl_renderer);
void SetGlVersionForTesting(const std::string& gl_version);
private: private:
BuildType build_type_; BuildType build_type_;
...@@ -68,9 +62,6 @@ class CastSysInfoDummy : public CastSysInfo { ...@@ -68,9 +62,6 @@ class CastSysInfoDummy : public CastSysInfo {
std::string factory_locale_; std::string factory_locale_;
std::string wifi_interface_; std::string wifi_interface_;
std::string ap_interface_; std::string ap_interface_;
std::string gl_vendor_;
std::string gl_renderer_;
std::string gl_version_;
DISALLOW_COPY_AND_ASSIGN(CastSysInfoDummy); DISALLOW_COPY_AND_ASSIGN(CastSysInfoDummy);
}; };
......
...@@ -64,12 +64,6 @@ class CastSysInfo { ...@@ -64,12 +64,6 @@ class CastSysInfo {
virtual std::string GetWifiInterface() = 0; virtual std::string GetWifiInterface() = 0;
// Returns the name of the software AP interface. // Returns the name of the software AP interface.
virtual std::string GetApInterface() = 0; virtual std::string GetApInterface() = 0;
// The following three APIs are deprecated and never called.
// TODO(halliwell): Remove them in the next system update.
virtual std::string GetGlVendor() = 0;
virtual std::string GetGlRenderer() = 0;
virtual std::string GetGlVersion() = 0;
}; };
} // namespace chromecast } // namespace chromecast
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment