Fix for issue 51693, which was a regression from integrating the open source...

chrome/browser/extensions/extension_rlz_module.cc

 // Copyright (c) 2010 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/extensions/extension_rlz_module.h"
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/rlz/rlz.h"
 #include "chrome/common/extensions/extension.h"
 #include "rlz/win/lib/lib_values.h"
 
 namespace {
 
 bool GetProductFromName(const std::string& product_name,
                         rlz_lib::Product* product) {
   bool success = true;
   switch (product_name[0]) {
     case 'B':
@@ skipping 60 matching lines @@
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(1, &ap_name));
   rlz_lib::AccessPoint access_point;
   EXTENSION_FUNCTION_VALIDATE(rlz_lib::GetAccessPointFromName(ap_name.c_str(),
                                                               &access_point));
 
   std::string event_name;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(2, &event_name));
   rlz_lib::Event event_id;
   EXTENSION_FUNCTION_VALIDATE(GetEventFromName(event_name, &event_id));
 
-  return RLZTracker::RecordProductEvent(product, access_point, event_id);
+  return rlz_lib::RecordProductEvent(product, access_point, event_id);
 }
 
 bool RlzGetAccessPointRlzFunction::RunImpl() {
   std::string ap_name;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &ap_name));
   rlz_lib::AccessPoint access_point;
   EXTENSION_FUNCTION_VALIDATE(rlz_lib::GetAccessPointFromName(ap_name.c_str(),
                                                               &access_point));
 
   char rlz[rlz_lib::kMaxRlzLength + 1];
@@ skipping 73 matching lines @@
     std::string ap_name;
     EXTENSION_FUNCTION_VALIDATE(access_points_list->GetString(i, &ap_name));
     EXTENSION_FUNCTION_VALIDATE(rlz_lib::GetAccessPointFromName(
         ap_name.c_str(), &access_points[i]));
   }
   access_points[i] = rlz_lib::NO_ACCESS_POINT;
 
   rlz_lib::ClearProductState(product, access_points.get());
   return true;
 }