rlz: Change omnibox / homepage access points from C1/C2 to C5/C6 on mac

chrome/browser/rlz/rlz_unittest.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.
 
 #include "chrome/browser/rlz/rlz.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 120 matching lines @@
 
   virtual bool SendFinancialPing(const std::string& brand,
                                  const string16& lang,
                                  const string16& referral) OVERRIDE {
     // Don't ping the server during tests, just pretend as if we did.
     EXPECT_FALSE(brand.empty());
     pinged_brands_.insert(brand);
 
     // Set new access points RLZ string, like the actual server ping would have
     // done.
-    rlz_lib::SetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, kNewOmniboxRlzString);
-    rlz_lib::SetAccessPointRlz(rlz_lib::CHROME_HOME_PAGE,
+    rlz_lib::SetAccessPointRlz(RLZTracker::CHROME_OMNIBOX,
+                               kNewOmniboxRlzString);
+    rlz_lib::SetAccessPointRlz(RLZTracker::CHROME_HOME_PAGE,
                                kNewHomepageRlzString);
     return true;
   }
 
   std::set<std::string> pinged_brands_;
   bool assume_not_ui_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRLZTracker);
 };
 
@@ skipping 148 matching lines @@
   google_util::GetBrand(&brand);
   EXPECT_EQ(expected, tracker_.was_ping_sent_for_brand(brand.c_str()));
 }
 
 void RlzLibTest::ExpectReactivationRlzPingSent(bool expected) {
   std::string brand;
   google_util::GetReactivationBrand(&brand);
   EXPECT_EQ(expected, tracker_.was_ping_sent_for_brand(brand.c_str()));
 }
 
-TEST_F(RlzLibTest, RecordProductEvent) {
-  RLZTracker::RecordProductEvent(rlz_lib::CHROME, rlz_lib::CHROME_OMNIBOX,
-                                 rlz_lib::FIRST_SEARCH);
-
-  ExpectEventRecorded("C1F", true);
-}
-
 // The events that affect the different RLZ scenarios are the following:
 //
 //  A: the user starts chrome for the first time
 //  B: the user stops chrome
 //  C: the user start a subsequent time
 //  D: the user stops chrome again
 //  I: the RLZTracker::DelayedInit() method is invoked
 //  X: the user performs a search using the omnibox
 //  Y: the user performs a search using the home page
 //
 // The events A to D happen in chronological order, but the other events
 // may happen at any point between A-B or C-D, in no particular order.
 //
 // The visible results of the scenarios are:
 //
 //  C1I event is recorded
 //  C2I event is recorded
 //  C1F event is recorded
 //  C2F event is recorded
 //  C1S event is recorded
 //  C2S event is recorded
 //  RLZ ping sent
 //
+//  On Mac, C5 / C6 are sent instead of C1 / C2.
+//
 // Variations on the above scenarios:
 //
 //  - if the delay specified to InitRlzDelayed() is negative, then the RLZ
 //    ping should be sent out at the time of event X and not wait for I
 //
 // Also want to test that pre-warming the RLZ string cache works correctly.
 
+#if !defined(OS_MACOSX)
+const char kC1I[] = "C1I";
+const char kC1S[] = "C1S";
+const char kC1F[] = "C1F";
+
+const char kC2I[] = "C2I";
+const char kC2S[] = "C2S";
+const char kC2F[] = "C2F";
+#else
+const char kC1I[] = "C5I";
+const char kC1S[] = "C5S";
+const char kC1F[] = "C5F";
+
+const char kC2I[] = "C6I";
+const char kC2S[] = "C6S";
+const char kC2F[] = "C6F";
+#endif
+
+TEST_F(RlzLibTest, RecordProductEvent) {
+  RLZTracker::RecordProductEvent(rlz_lib::CHROME, RLZTracker::CHROME_OMNIBOX,
+                                 rlz_lib::FIRST_SEARCH);
+
+  ExpectEventRecorded(kC1F, true);
+}
+
 TEST_F(RlzLibTest, QuickStopAfterStart) {
   RLZTracker::InitRlzDelayed(true, 20, true, true);
 
   // Omnibox events.
-  ExpectEventRecorded("C1I", false);
-  ExpectEventRecorded("C1S", false);
-  ExpectEventRecorded("C1F", false);
+  ExpectEventRecorded(kC1I, false);
+  ExpectEventRecorded(kC1S, false);
+  ExpectEventRecorded(kC1F, false);
 
   // Home page events.
-  ExpectEventRecorded("C2I", false);
-  ExpectEventRecorded("C2S", false);
-  ExpectEventRecorded("C2F", false);
+  ExpectEventRecorded(kC2I, false);
+  ExpectEventRecorded(kC2S, false);
+  ExpectEventRecorded(kC2F, false);
 
   ExpectRlzPingSent(false);
 }
 
 TEST_F(RlzLibTest, DelayedInitOnly) {
   RLZTracker::InitRlzDelayed(true, 20, true, true);
   InvokeDelayedInit();
 
   // Omnibox events.
-  ExpectEventRecorded("C1I", true);
-  ExpectEventRecorded("C1S", true);
-  ExpectEventRecorded("C1F", false);
+  ExpectEventRecorded(kC1I, true);
+  ExpectEventRecorded(kC1S, true);
+  ExpectEventRecorded(kC1F, false);
 
   // Home page events.
-  ExpectEventRecorded("C2I", true);
-  ExpectEventRecorded("C2S", true);
-  ExpectEventRecorded("C2F", false);
+  ExpectEventRecorded(kC2I, true);
+  ExpectEventRecorded(kC2S, true);
+  ExpectEventRecorded(kC2F, false);
 
   ExpectRlzPingSent(true);
 }
 
 TEST_F(RlzLibTest, DelayedInitOnlyNoFirstRunNoRlzStrings) {
   RLZTracker::InitRlzDelayed(false, 20, true, true);
   InvokeDelayedInit();
 
   // Omnibox events.
-  ExpectEventRecorded("C1I", true);
-  ExpectEventRecorded("C1S", true);
-  ExpectEventRecorded("C1F", false);
+  ExpectEventRecorded(kC1I, true);
+  ExpectEventRecorded(kC1S, true);
+  ExpectEventRecorded(kC1F, false);
 
   // Home page events.
-  ExpectEventRecorded("C2I", true);
-  ExpectEventRecorded("C2S", true);
-  ExpectEventRecorded("C2F", false);
+  ExpectEventRecorded(kC2I, true);
+  ExpectEventRecorded(kC2S, true);
+  ExpectEventRecorded(kC2F, false);
 
   ExpectRlzPingSent(true);
 }
 
 TEST_F(RlzLibTest, DelayedInitOnlyNoFirstRun) {
   // Set some dummy RLZ strings to simulate that we already ran before and
   // performed a successful ping to the RLZ server.
-  rlz_lib::SetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, kOmniboxRlzString);
-  rlz_lib::SetAccessPointRlz(rlz_lib::CHROME_HOME_PAGE, kHomepageRlzString);
+  rlz_lib::SetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, kOmniboxRlzString);
+  rlz_lib::SetAccessPointRlz(RLZTracker::CHROME_HOME_PAGE, kHomepageRlzString);
 
   RLZTracker::InitRlzDelayed(false, 20, true, true);
   InvokeDelayedInit();
 
   // Omnibox events.
-  ExpectEventRecorded("C1I", true);
-  ExpectEventRecorded("C1S", false);
-  ExpectEventRecorded("C1F", false);
+  ExpectEventRecorded(kC1I, true);
+  ExpectEventRecorded(kC1S, false);
+  ExpectEventRecorded(kC1F, false);
 
   // Home page events.
-  ExpectEventRecorded("C2I", true);
-  ExpectEventRecorded("C2S", false);
-  ExpectEventRecorded("C2F", false);
+  ExpectEventRecorded(kC2I, true);
+  ExpectEventRecorded(kC2S, false);
+  ExpectEventRecorded(kC2F, false);
 
   ExpectRlzPingSent(true);
 }
 
 TEST_F(RlzLibTest, DelayedInitOnlyNoGoogleDefaultSearchOrHomepage) {
   RLZTracker::InitRlzDelayed(true, 20, false, false);
   InvokeDelayedInit();
 
   // Omnibox events.
-  ExpectEventRecorded("C1I", true);
-  ExpectEventRecorded("C1S", false);
-  ExpectEventRecorded("C1F", false);
+  ExpectEventRecorded(kC1I, true);
+  ExpectEventRecorded(kC1S, false);
+  ExpectEventRecorded(kC1F, false);
 
   // Home page events.
-  ExpectEventRecorded("C2I", true);
-  ExpectEventRecorded("C2S", false);
-  ExpectEventRecorded("C2F", false);
+  ExpectEventRecorded(kC2I, true);
+  ExpectEventRecorded(kC2S, false);
+  ExpectEventRecorded(kC2F, false);
 
   ExpectRlzPingSent(true);
 }
 
 TEST_F(RlzLibTest, OmniboxUsageOnly) {
   RLZTracker::InitRlzDelayed(true, 20, true, true);
   SimulateOmniboxUsage();
 
   // Omnibox events.
-  ExpectEventRecorded("C1I", false);
-  ExpectEventRecorded("C1S", false);
-  ExpectEventRecorded("C1F", true);
+  ExpectEventRecorded(kC1I, false);
+  ExpectEventRecorded(kC1S, false);
+  ExpectEventRecorded(kC1F, true);
 
   // Home page events.
-  ExpectEventRecorded("C2I", false);
-  ExpectEventRecorded("C2S", false);
-  ExpectEventRecorded("C2F", false);
+  ExpectEventRecorded(kC2I, false);
+  ExpectEventRecorded(kC2S, false);
+  ExpectEventRecorded(kC2F, false);
 
   ExpectRlzPingSent(false);
 }
 
 TEST_F(RlzLibTest, HomepageUsageOnly) {
   RLZTracker::InitRlzDelayed(true, 20, true, true);
   SimulateHomepageUsage();
 
   // Omnibox events.
-  ExpectEventRecorded("C1I", false);
-  ExpectEventRecorded("C1S", false);
-  ExpectEventRecorded("C1F", false);
+  ExpectEventRecorded(kC1I, false);
+  ExpectEventRecorded(kC1S, false);
+  ExpectEventRecorded(kC1F, false);
 
   // Home page events.
-  ExpectEventRecorded("C2I", false);
-  ExpectEventRecorded("C2S", false);
-  ExpectEventRecorded("C2F", true);
+  ExpectEventRecorded(kC2I, false);
+  ExpectEventRecorded(kC2S, false);
+  ExpectEventRecorded(kC2F, true);
 
   ExpectRlzPingSent(false);
 }
 
 TEST_F(RlzLibTest, UsageBeforeDelayedInit) {
   RLZTracker::InitRlzDelayed(true, 20, true, true);
   SimulateOmniboxUsage();
   SimulateHomepageUsage();
   InvokeDelayedInit();
 
   // Omnibox events.
-  ExpectEventRecorded("C1I", true);
-  ExpectEventRecorded("C1S", true);
-  ExpectEventRecorded("C1F", true);
+  ExpectEventRecorded(kC1I, true);
+  ExpectEventRecorded(kC1S, true);
+  ExpectEventRecorded(kC1F, true);
 
   // Home page events.
-  ExpectEventRecorded("C2I", true);
-  ExpectEventRecorded("C2S", true);
-  ExpectEventRecorded("C2F", true);
+  ExpectEventRecorded(kC2I, true);
+  ExpectEventRecorded(kC2S, true);
+  ExpectEventRecorded(kC2F, true);
 
   ExpectRlzPingSent(true);
 }
 
 TEST_F(RlzLibTest, OmniboxUsageAfterDelayedInit) {
   RLZTracker::InitRlzDelayed(true, 20, true, true);
   InvokeDelayedInit();
   SimulateOmniboxUsage();
   SimulateHomepageUsage();
 
   // Omnibox events.
-  ExpectEventRecorded("C1I", true);
-  ExpectEventRecorded("C1S", true);
-  ExpectEventRecorded("C1F", true);
+  ExpectEventRecorded(kC1I, true);
+  ExpectEventRecorded(kC1S, true);
+  ExpectEventRecorded(kC1F, true);
 
   // Home page events.
-  ExpectEventRecorded("C2I", true);
-  ExpectEventRecorded("C2S", true);
-  ExpectEventRecorded("C2F", true);
+  ExpectEventRecorded(kC2I, true);
+  ExpectEventRecorded(kC2S, true);
+  ExpectEventRecorded(kC2F, true);
 
   ExpectRlzPingSent(true);
 }
 
 TEST_F(RlzLibTest, OmniboxUsageSendsPingWhenDelayNegative) {
   RLZTracker::InitRlzDelayed(true, -20, true, true);
   SimulateOmniboxUsage();
 
   // Omnibox events.
-  ExpectEventRecorded("C1I", true);
-  ExpectEventRecorded("C1S", true);
-  ExpectEventRecorded("C1F", true);
+  ExpectEventRecorded(kC1I, true);
+  ExpectEventRecorded(kC1S, true);
+  ExpectEventRecorded(kC1F, true);
 
   // Home page events.
-  ExpectEventRecorded("C2I", true);
-  ExpectEventRecorded("C2S", true);
-  ExpectEventRecorded("C2F", false);
+  ExpectEventRecorded(kC2I, true);
+  ExpectEventRecorded(kC2S, true);
+  ExpectEventRecorded(kC2F, false);
 
   ExpectRlzPingSent(true);
 }
 
 TEST_F(RlzLibTest, HomepageUsageDoesNotSendPingWhenDelayNegative) {
   RLZTracker::InitRlzDelayed(true, -20, true, true);
   SimulateHomepageUsage();
 
   // Omnibox events.
-  ExpectEventRecorded("C1I", false);
-  ExpectEventRecorded("C1S", false);
-  ExpectEventRecorded("C1F", false);
+  ExpectEventRecorded(kC1I, false);
+  ExpectEventRecorded(kC1S, false);
+  ExpectEventRecorded(kC1F, false);
 
   // Home page events.
-  ExpectEventRecorded("C2I", false);
-  ExpectEventRecorded("C2S", false);
-  ExpectEventRecorded("C2F", true);
+  ExpectEventRecorded(kC2I, false);
+  ExpectEventRecorded(kC2S, false);
+  ExpectEventRecorded(kC2F, true);
 
   ExpectRlzPingSent(false);
 }
 
 TEST_F(RlzLibTest, GetAccessPointRlzOnIoThread) {
   // Set dummy RLZ string.
-  rlz_lib::SetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, kOmniboxRlzString);
+  rlz_lib::SetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, kOmniboxRlzString);
 
   string16 rlz;
 
   tracker_.set_assume_not_ui_thread(true);
-  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz));
+  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz));
   EXPECT_STREQ(kOmniboxRlzString, UTF16ToUTF8(rlz).c_str());
 }
 
 TEST_F(RlzLibTest, GetAccessPointRlzNotOnIoThread) {
   // Set dummy RLZ string.
-  rlz_lib::SetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, kOmniboxRlzString);
+  rlz_lib::SetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, kOmniboxRlzString);
 
   string16 rlz;
 
   tracker_.set_assume_not_ui_thread(false);
-  EXPECT_FALSE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz));
+  EXPECT_FALSE(RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz));
 }
 
 TEST_F(RlzLibTest, GetAccessPointRlzIsCached) {
   // Set dummy RLZ string.
-  rlz_lib::SetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, kOmniboxRlzString);
+  rlz_lib::SetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, kOmniboxRlzString);
 
   string16 rlz;
 
   tracker_.set_assume_not_ui_thread(false);
-  EXPECT_FALSE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz));
+  EXPECT_FALSE(RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz));
 
   tracker_.set_assume_not_ui_thread(true);
-  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz));
+  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz));
   EXPECT_STREQ(kOmniboxRlzString, UTF16ToUTF8(rlz).c_str());
 
   tracker_.set_assume_not_ui_thread(false);
-  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz));
+  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz));
   EXPECT_STREQ(kOmniboxRlzString, UTF16ToUTF8(rlz).c_str());
 }
 
 TEST_F(RlzLibTest, PingUpdatesRlzCache) {
   // Set dummy RLZ string.
-  rlz_lib::SetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, kOmniboxRlzString);
-  rlz_lib::SetAccessPointRlz(rlz_lib::CHROME_HOME_PAGE, kHomepageRlzString);
+  rlz_lib::SetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, kOmniboxRlzString);
+  rlz_lib::SetAccessPointRlz(RLZTracker::CHROME_HOME_PAGE, kHomepageRlzString);
 
   string16 rlz;
 
   // Prime the cache.
   tracker_.set_assume_not_ui_thread(true);
 
-  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz));
+  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz));
   EXPECT_STREQ(kOmniboxRlzString, UTF16ToUTF8(rlz).c_str());
-  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_HOME_PAGE, &rlz));
+  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(
+        RLZTracker::CHROME_HOME_PAGE, &rlz));
   EXPECT_STREQ(kHomepageRlzString, UTF16ToUTF8(rlz).c_str());
 
   // Make sure cache is valid.
   tracker_.set_assume_not_ui_thread(false);
 
-  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz));
+  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz));
   EXPECT_STREQ(kOmniboxRlzString, UTF16ToUTF8(rlz).c_str());
-  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_HOME_PAGE, &rlz));
+  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(
+        RLZTracker::CHROME_HOME_PAGE, &rlz));
   EXPECT_STREQ(kHomepageRlzString, UTF16ToUTF8(rlz).c_str());
 
   // Perform ping.
   tracker_.set_assume_not_ui_thread(true);
   RLZTracker::InitRlzDelayed(true, 20, true, true);
   InvokeDelayedInit();
   ExpectRlzPingSent(true);
 
   // Make sure cache is now updated.
   tracker_.set_assume_not_ui_thread(false);
 
-  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz));
+  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz));
   EXPECT_STREQ(kNewOmniboxRlzString, UTF16ToUTF8(rlz).c_str());
-  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_HOME_PAGE, &rlz));
+  EXPECT_TRUE(RLZTracker::GetAccessPointRlz(
+        RLZTracker::CHROME_HOME_PAGE, &rlz));
   EXPECT_STREQ(kNewHomepageRlzString, UTF16ToUTF8(rlz).c_str());
 }
 
 TEST_F(RlzLibTest, ObserveHandlesBadArgs) {
   scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());
   entry->SetPageID(0);
   entry->SetTransitionType(content::PAGE_TRANSITION_LINK);
   tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING,
                    content::NotificationService::AllSources(),
                    content::Details<NavigationEntry>(NULL));
@@ skipping 40 matching lines @@
   SetMainBrand("GGLS");
   SetReactivationBrand("GGRS");
 
   RLZTracker::InitRlzDelayed(true, 20, true, true);
   InvokeDelayedInit();
 
   ExpectRlzPingSent(false);
   ExpectReactivationRlzPingSent(false);
 }
 #endif  // defined(OS_WIN)