Only send C2F ping for a search through homepage.

rlz/test/rlz_test_helpers.cc

 // Copyright (c) 2012 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.
 //
 // Main entry point for all unit tests.
 
 #include "rlz_test_helpers.h"
 
 #include <map>
 #include <vector>
@@ skipping 68 matching lines @@
 
   // Next write values recursively.
   for (std::map<base::string16, RegistryKeyData>::const_iterator iter =
            data.keys.begin();
        iter != data.keys.end(); ++iter) {
     base::win::RegKey key(dest->Handle(), iter->first.c_str(), KEY_ALL_ACCESS);
     WriteRegistryTree(iter->second, &key);
   }
 }
 
+}  // namespace
+
 // Initialize temporary HKLM/HKCU registry hives used for testing.
 // Testing RLZ requires reading and writing to the Windows registry.  To keep
 // the tests isolated from the machine's state, as well as to prevent the tests
 // from causing side effects in the registry, HKCU and HKLM are overridden for
 // the duration of the tests. RLZ tests don't expect the HKCU and KHLM hives to
 // be empty though, and this function initializes the minimum value needed so
 // that the test will run successfully.
 void InitializeRegistryOverridesForTesting(
     registry_util::RegistryOverrideManager* override_manager) {
   // For the moment, the HKCU hive requires no initialization.
@@ skipping 15 matching lines @@
   override_manager->OverrideRegistry(HKEY_LOCAL_MACHINE);
   override_manager->OverrideRegistry(HKEY_CURRENT_USER);
 
   if (do_copy) {
     base::win::RegKey key(
         HKEY_LOCAL_MACHINE, kHKLMAccessProviders, KEY_ALL_ACCESS);
     WriteRegistryTree(data, &key);
   }
 }
 
-}  // namespace
 
 #endif  // defined(OS_WIN)
 
 void RlzLibTestNoMachineState::SetUp() {
 #if defined(OS_WIN)
   InitializeRegistryOverridesForTesting(&override_manager_);
 #elif defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif  // defined(OS_WIN)
 #if defined(OS_POSIX)
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   rlz_lib::testing::SetRlzStoreDirectory(temp_dir_.path());
 #endif  // defined(OS_POSIX)
 }

[Roger Tawa OOO till Jul 10th, 2014/09/30 14:43:35]

I think it would be better to put all the code above into a helper function that
can be called from c/b/rlz_unittest.cc, instead of just exposing
InitializeRegistryOverridesForTesting().  Same for TearDown().  You could call
them something like:

SetUpMachineStateForRlzTesting(
    registry_util::RegistryOverrideManager* override_manager);
TearDownMachineStateForRlzTesting();

[yao, 2014/09/30 17:10:44]

Are you saying we should have an overloading function
SetUpMachineStateForRlzTesting that takes in different parameters? 

A separate question, what is "base::mac::ScopedNSAutoreleasePool pool" there
for? since I don't see it being used anywhere. 

[Roger Tawa OOO till Jul 10th, 2014/09/30 18:24:36]

No overload, because RlzLibTest no longer derives from RlzLibTestNoMachineState.

What I mean is move all the code from lines 130 to 138 into
SetUpMachineStateForRlzTesting().  Then RlzLibTestNoMachineState::SetUp() can
call that function, and RlzLibTest can also call that function from line 202 in
rlz_unittest.cc.

Similar pattern for TearDown().

Wrt ScopedNSAutoreleasePool, good question.  Maybe Alexei can tell you, or Nico
(thakis@).

[yao, 2014/09/30 18:30:01]

hm... maybe I'm confused, but how are we planning to pass the private members to
that function? 

 
 void RlzLibTestNoMachineState::TearDown() {
 #if defined(OS_POSIX)
   rlz_lib::testing::SetRlzStoreDirectory(base::FilePath());
 #endif  // defined(OS_POSIX)
 }
 
 void RlzLibTestBase::SetUp() {
   RlzLibTestNoMachineState::SetUp();
 #if defined(OS_WIN)
   rlz_lib::CreateMachineState();
 #endif  // defined(OS_WIN)
 }