Componentize ComponentUpdaterConfigurator

components/update_client/update_query_params.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/update_client/update_query_params.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/win/windows_version.h"
 #include "components/update_client/update_query_params_delegate.h"
 
 namespace update_client {
 
 namespace {
 
 const char kUnknown[] = "unknown";
+const char kStable[] = "stable";
+const char kBeta[] = "beta";
+const char kDev[] = "dev";
+const char kCanary[] = "canary";
 
 // The request extra information is the OS and architecture, this helps
 // the server select the right package to be delivered.
 const char kOs[] =
 #if defined(OS_MACOSX)
     "mac";
 #elif defined(OS_WIN)
     "win";
 #elif defined(OS_ANDROID)
     "android";
@@ skipping 93 matching lines @@
 #error "You need to add support for your architecture here"
 #endif
 }
 
 // static
 void UpdateQueryParams::SetDelegate(UpdateQueryParamsDelegate* delegate) {
   DCHECK(!g_delegate || !delegate || (delegate == g_delegate));
   g_delegate = delegate;
 }
 
+// static
+const char* UpdateQueryParams::GetChannelString(version_info::Channel channel) {

[sdefresne, 2015/08/13 12:20:00]

This is duplicating version_info::GetChannelString(). Please use the function
from the version_info component instead. Or document why it is required not to
use version_info::GetChannelString().

[droger, 2015/08/13 13:17:46]

Done, using version_info instead, which actually simplifies the code a lot.
sorin: was there a good reason to have duplication here?

[Sorin Jianu, 2015/08/13 18:24:11]

It appears that sdefresne@ componentized version_info recently (
https://codereview.chromium.org/1257633002) and for some reason, the duplicated
code in chrome_update_query_params_delegate.cc was not removed. At any rate,
this is excellent refactoring, we could eliminate the duplicated code.

Somehow related, the whole thing about query parameters and query parameters
delegate could be redone, but that is outside the scope of this change, and a
task for the owners of the respective modules.

+  switch (channel) {
+    case version_info::Channel::STABLE:
+      return kStable;
+      break;
+    case version_info::Channel::BETA:
+      return kBeta;
+      break;
+    case version_info::Channel::DEV:
+      return kDev;
+      break;
+    case version_info::Channel::CANARY:
+      return kCanary;
+      break;
+    case version_info::Channel::UNKNOWN:
+      return kUnknown;
+      break;
+  }
+  return kUnknown;
+}
+
 }  // namespace update_client