Revert 82691 - Use "canary" instead of "canary build" as the channel name in the Windowscanary, matching the Mac canary and the new approved naming.BUG=79814TEST=The About windowReview URL: http://codereview.chromium.org/6895022

Get rid of redness in official bulder

TBR=mark@chromium.org
Review URL: http://codereview.chromium.org/6900027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82708 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 10 deletions

diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index c6c49a4..07eeb95 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -86,16 +86,19 @@ ProfileSyncService::ProfileSyncService(ProfileSyncFactory* factory,
                  NotificationType::SYNC_DATA_TYPES_UPDATED,
                  Source<Profile>(profile));
 
-  // By default, dev, canary, and undbranded Chromium users will go to the
-  // development servers. Development servers have more features than standard
-  // sync servers. Users with officially-branded Chrome stable and beta builds
-  // will go to the standard sync servers.
+  // By default, dev & chromium users will go to the development servers.
+  // Dev servers have more features than standard sync servers.
+  // Chrome stable and beta builds will go to the standard sync servers.
 #if defined(GOOGLE_CHROME_BUILD)
-  // GetInstallationChannel hits the registry on Windows. See
-  // http://crbug.com/70380.
+  // GetVersionStringModifier hits the registry. See http://crbug.com/70380.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
-  std::string channel = platform_util::GetInstallationChannel();
-  if (channel == "stable" || channel == "beta") {
+  // For stable, this is "". For dev, this is "dev". For beta, this is "beta".
+  // For daily, this is "canary build".
+  // For Linux Chromium builds, this could be anything depending on the
+  // distribution, so always direct those users to dev server urls.
+  // If this is an official build, it will always be one of the above.
+  std::string channel = platform_util::GetVersionStringModifier();
+  if (channel.empty() || channel == "beta") {
     sync_service_url_ = GURL(kSyncServerUrl);
   }
 #endif
diff --git a/chrome/installer/util/google_chrome_sxs_distribution.cc b/chrome/installer/util/google_chrome_sxs_distribution.cc
index 416bc67..9ea35f1 100644
--- a/chrome/installer/util/google_chrome_sxs_distribution.cc
+++ b/chrome/installer/util/google_chrome_sxs_distribution.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 //
@@ -14,7 +14,7 @@
 namespace {
 
 const wchar_t kChromeSxSGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}";
-const wchar_t kChannelName[] = L"canary";
+const wchar_t kChannelName[] = L"canary build";
 const wchar_t kBrowserAppId[] = L"ChromeCanary";
 const int kSxSIconIndex = 4;