GCAPI should append to the existing experiment_labels instead of clobbering them.

chrome/installer/gcapi/gcapi_registry_overriding_test.h

Index: chrome/installer/gcapi/gcapi_registry_overriding_test.h
diff --git a/chrome/installer/gcapi/gcapi_registry_overriding_test.h b/chrome/installer/gcapi/gcapi_registry_overriding_test.h
new file mode 100644
index 0000000000000000000000000000000000000000..bbeacd566d6dfe1592bade4ac97f5ecf2f34a079
--- /dev/null
+++ b/chrome/installer/gcapi/gcapi_registry_overriding_test.h
@@ -0,0 +1,21 @@
+// Copyright 2013 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.
+
+#ifndef CHROME_INSTALLER_GCAPI_GCAPI_REGISTRY_OVERRIDING_TEST_H_
+#define CHROME_INSTALLER_GCAPI_GCAPI_REGISTRY_OVERRIDING_TEST_H_
+
+#include "base/compiler_specific.h"
+#include "base/test/test_reg_util_win.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+// A test fixture for GCAPI tests overriding the registry.
+class GCAPIRegistryOverridingTest : public ::testing::Test {

[Alexei Svitkine (slow), 2013/09/03 15:46:35]

Instead of exposing a test base class for this, consider just wrapping the
functionality into its own non-test class - e.g. GCAPIRegistryOverrideManager
that holds the registry_util::RegistryOverrideManager instance and having the
Setup() stuff be done in its ctor.

Then, any test class that needs this can just add an instance of
GCAPIRegistryOverrideManager as a member variable. With that approach, if
another test (that has its own test baseclass) also wants to override the GCAPI
registry stuff, it can still do it (vs. this design where it wouldn't be able to
since it already has its own base class).

[gab, 2013/11/05 22:20:38]

Done.

+ protected:
+  void SetUp() OVERRIDE;

[Alexei Svitkine (slow), 2013/09/03 15:46:35]

Declare ctor and destructor explicitly and define them in the cc file.

[gab, 2013/11/05 22:20:38]

Done.

+
+ private:
+  registry_util::RegistryOverrideManager override_manager_;
+};

[Alexei Svitkine (slow), 2013/09/03 15:46:35]

DISALLOW_COPY_AND_ASSIGN?

[gab, 2013/11/05 22:20:38]

Done.

+
+#endif  // CHROME_INSTALLER_GCAPI_GCAPI_REGISTRY_OVERRIDING_TEST_H_