Only send C2F ping for a search through homepage.

BUG=8424708

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

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

3 files changed, 29 insertions, 7 deletions

diff --git a/rlz/lib/rlz_lib_test.cc b/rlz/lib/rlz_lib_test.cc
index 9b07789..fd6f419 100644
--- a/rlz/lib/rlz_lib_test.cc
+++ b/rlz/lib/rlz_lib_test.cc
@@ -844,7 +844,8 @@ class ReadonlyRlzDirectoryTest : public RlzLibTestNoMachineState {
 void ReadonlyRlzDirectoryTest::SetUp() {
   RlzLibTestNoMachineState::SetUp();
   // Make the rlz directory non-writeable.
-  int chmod_result = chmod(temp_dir_.path().value().c_str(), 0500);
+  int chmod_result = chmod(m_rlz_test_helper_.temp_dir_.path().value().c_str(),
+                           0500);
   ASSERT_EQ(0, chmod_result);
 }
 
diff --git a/rlz/test/rlz_test_helpers.cc b/rlz/test/rlz_test_helpers.cc
index 53c9732..b056a81 100644
--- a/rlz/test/rlz_test_helpers.cc
+++ b/rlz/test/rlz_test_helpers.cc
@@ -125,7 +125,7 @@ void InitializeRegistryOverridesForTesting(
 
 #endif  // defined(OS_WIN)
 
-void RlzLibTestNoMachineState::SetUp() {
+void RlzLibTestNoMachineStateHelper::SetUp() {
 #if defined(OS_WIN)
   InitializeRegistryOverridesForTesting(&override_manager_);
 #elif defined(OS_MACOSX)
@@ -137,12 +137,20 @@ void RlzLibTestNoMachineState::SetUp() {
 #endif  // defined(OS_POSIX)
 }
 
-void RlzLibTestNoMachineState::TearDown() {
+void RlzLibTestNoMachineStateHelper::TearDown() {
 #if defined(OS_POSIX)
   rlz_lib::testing::SetRlzStoreDirectory(base::FilePath());
 #endif  // defined(OS_POSIX)
 }
 
+void RlzLibTestNoMachineState::SetUp() {
+  m_rlz_test_helper_.SetUp();
+}
+
+void RlzLibTestNoMachineState::TearDown() {
+  m_rlz_test_helper_.TearDown();
+}
+
 void RlzLibTestBase::SetUp() {
   RlzLibTestNoMachineState::SetUp();
 #if defined(OS_WIN)
diff --git a/rlz/test/rlz_test_helpers.h b/rlz/test/rlz_test_helpers.h
index 685a358..c02aadc 100644
--- a/rlz/test/rlz_test_helpers.h
+++ b/rlz/test/rlz_test_helpers.h
@@ -18,10 +18,13 @@
 #include "base/test/test_reg_util_win.h"
 #endif
 
-class RlzLibTestNoMachineState : public ::testing::Test {
- protected:
-  void SetUp() override;
-  void TearDown() override;
+// A test helper class that constructs and destructs platform dependent machine
+// state. It's used by src/chrome/browser/rlz/rlz_unittest.cc and
+// src/rlz/lib/rlz_lib_test.cc
+class RlzLibTestNoMachineStateHelper {
+ public:
+  void SetUp();
+  void TearDown();
 
 #if defined(OS_POSIX)
   base::ScopedTempDir temp_dir_;
@@ -32,9 +35,19 @@ class RlzLibTestNoMachineState : public ::testing::Test {
 #endif
 };
 
+class RlzLibTestNoMachineState : public ::testing::Test {
+ protected:
+  void SetUp() override;
+  void TearDown() override;
+
+  RlzLibTestNoMachineStateHelper m_rlz_test_helper_;
+};
+
 class RlzLibTestBase : public RlzLibTestNoMachineState {
  protected:
   void SetUp() override;
+
+  RlzLibTestNoMachineStateHelper m_rlz_test_helper_;
 };
 
 #endif  // RLZ_TEST_RLZ_TEST_HELPERS_H