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

chrome/browser/search_engines/template_url_model.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/search_engines/template_url_model.h"
 
 #include "app/l10n_util.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 484 matching lines @@
     TemplateURL* modifiable_url = const_cast<TemplateURL*>(url);
     // Don't mark the url as edited, otherwise we won't be able to rev the
     // templateurls we ship with.
     modifiable_url->set_show_in_default_list(true);
     if (service_.get())
       service_.get()->UpdateKeyword(*url);
 
     const TemplateURLRef* url_ref = url->url();
     if (url_ref && url_ref->HasGoogleBaseURLs()) {
       GoogleURLTracker::RequestServerCheck();
-#if defined(OS_WIN)
+#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
       RLZTracker::RecordProductEvent(rlz_lib::CHROME,
                                      rlz_lib::CHROME_OMNIBOX,
                                      rlz_lib::SET_TO_GOOGLE);
 #endif
     }
   }
 
   SaveDefaultSearchProviderToPrefs(url);
 
   if (service_.get())
@@ skipping 590 matching lines @@
 const TemplateURL* TemplateURLModel::GetTemplateURLForExtension(
     Extension* extension) const {
   for (TemplateURLVector::const_iterator i = template_urls_.begin();
        i != template_urls_.end(); ++i) {
     if ((*i)->IsExtensionKeyword() && (*i)->url()->GetHost() == extension->id())
       return *i;
   }
 
   return NULL;
 }