Fix Wunused-const-variable warnings after https://codereview.chromium.org/1227843008/

Also move a class only used in official builds under that ifdef, and make a
few test-only consts global.

No intended behavior change. Fixes:

..\..\chrome\installer\setup\setup_util_unittest.cc(531,41) :  error: unused
variable 'kVersionString' [-Werror,-Wunused-const-variable]
const wchar_t MigrateMultiToSingleTest::kVersionString[] = L"30.0.1574.0";
                                        ^
..\..\chrome\installer\setup\setup_util_unittest.cc(532,41) :  error: unused
variable 'kMultiChannel' [-Werror,-Wunused-const-variable]
const wchar_t MigrateMultiToSingleTest::kMultiChannel[] =
                                        ^
BUG=153829
TBR=grt

Review URL: https://codereview.chromium.org/1239963005 .

Cr-Commit-Position: refs/heads/master@{#339125}

1 files changed, 5 insertions, 14 deletions

diff --git a/chrome/installer/setup/setup_util_unittest.cc b/chrome/installer/setup/setup_util_unittest.cc
index 0e01061..1ac23b8 100644
--- a/chrome/installer/setup/setup_util_unittest.cc
+++ b/chrome/installer/setup/setup_util_unittest.cc
@@ -508,7 +508,12 @@ TEST_F(FindArchiveToPatchTest, DesiredVersionNotFound) {
   EXPECT_EQ(base::FilePath().value(), patch_source.value());
 }
 
+#if defined(GOOGLE_CHROME_BUILD)
 namespace {
+const bool kSystemLevel = false;
+const HKEY kRootKey = kSystemLevel ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
+const wchar_t kVersionString[] = L"30.0.1574.0";
+const wchar_t kMultiChannel[] = L"2.0-dev-multi-chromeframe";
 
 class MigrateMultiToSingleTest : public testing::Test {
  protected:
@@ -516,25 +521,11 @@ class MigrateMultiToSingleTest : public testing::Test {
     registry_override_manager_.OverrideRegistry(kRootKey);
   }
 
-  static const bool kSystemLevel = false;
-  static const HKEY kRootKey;
-  static const wchar_t kVersionString[];
-  static const wchar_t kMultiChannel[];
-
  private:
   registry_util::RegistryOverrideManager registry_override_manager_;
 };
-
-const bool MigrateMultiToSingleTest::kSystemLevel;
-const HKEY MigrateMultiToSingleTest::kRootKey =
-    kSystemLevel ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-const wchar_t MigrateMultiToSingleTest::kVersionString[] = L"30.0.1574.0";
-const wchar_t MigrateMultiToSingleTest::kMultiChannel[] =
-    L"2.0-dev-multi-chromeframe";
-
 }  // namespace
 
-#if defined(GOOGLE_CHROME_BUILD)
 // Test migrating Chrome Frame from multi to single.
 TEST_F(MigrateMultiToSingleTest, ChromeFrame) {
   installer::ProductState chrome_frame;