Move version_info::GetChannel() into version_info::android namespace.

Because it is actually an Android-only function. Update the caller in
chrome/common and fix a random nit there.

Change-Id: I4b488987cf4bb245c1665abefc24285aa6192b2a
Reviewed-on: https://chromium-review.googlesource.com/c/1338886Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608815}

android_webview/browser/aw_metrics_service_client.cc

@@ -240,7 +240,7 @@ bool AwMetricsServiceClient::GetBrand(std::string* brand_code) {
 }
 
 metrics::SystemProfileProto::Channel AwMetricsServiceClient::GetChannel() {
-  return metrics::AsProtobufChannel(version_info::GetChannel());
+  return metrics::AsProtobufChannel(version_info::android::GetChannel());
 }
 
 std::string AwMetricsServiceClient::GetVersionString() {

android_webview/common/aw_channel.cc

@@ -11,7 +11,7 @@ namespace android_webview {
 using version_info::Channel;
 
 Channel GetChannelOrStable() {
-  Channel channel = version_info::GetChannel();
+  Channel channel = version_info::android::GetChannel();
   return channel == Channel::UNKNOWN ? Channel::STABLE : channel;
 }
 

chrome/common/channel_info_android.cc

@@ -25,7 +25,7 @@ std::string GetChannelName() {
 }
 
 version_info::Channel GetChannel() {
-  return version_info::GetChannel();
+  return version_info::android::GetChannel();
 }
 
 }  // namespace chrome

chrome/common/channel_info_mac.mm

@@ -43,18 +43,15 @@ std::string GetChannelName() {
 
 version_info::Channel GetChannelByName(const std::string& channel) {
 #if defined(GOOGLE_CHROME_BUILD)
-
-  if (channel.empty()) {
+  if (channel.empty())
     return version_info::Channel::STABLE;
-  } else if (channel == "beta") {
+  if (channel == "beta")
     return version_info::Channel::BETA;
-  } else if (channel == "dev") {
+  if (channel == "dev")
     return version_info::Channel::DEV;
-  } else if (channel == "canary") {
+  if (channel == "canary")
     return version_info::Channel::CANARY;
-  }
 #endif
-
   return version_info::Channel::UNKNOWN;
 }
 

components/version_info/android/channel_getter.cc

@@ -7,10 +7,12 @@
 #include "jni/VersionConstantsBridge_jni.h"
 
 namespace version_info {
+namespace android {
 
 Channel GetChannel() {
   JNIEnv* env = base::android::AttachCurrentThread();
   return static_cast<Channel>(Java_VersionConstantsBridge_getChannel(env));
 }
 
+}  // namespace android
 }  // namespace version_info

components/version_info/android/channel_getter.h

@@ -8,9 +8,11 @@
 #include "components/version_info/channel.h"
 
 namespace version_info {
+namespace android {
 
 Channel GetChannel();
 
-}
+}  // namespace android
+}  // namespace version_info
 
 #endif  // COMPONENTS_VERSION_INFO_ANDROID_CHANNEL_GETTER_H_