Changed FirstPotentialDefaultEngine histogram to log whether or not we are syncing function is call…

chrome/browser/search_engines/template_url_service.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/search_engines/template_url_service.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/guid.h"
@@ skipping 75 matching lines @@
       (url1->input_encodings() == url2->input_encodings());
 }
 
 const char kFirstPotentialEngineHistogramName[] =
     "Search.FirstPotentialEngineCalled";
 
 // Values for an enumerated histogram used to track whenever
 // FirstPotentialDefaultEngine is called, and from where.
 enum FirstPotentialEngineCaller {
   FIRST_POTENTIAL_CALLSITE_FIND_NEW_DSP,
+  FIRST_POTENTIAL_CALLSITE_FIND_NEW_DSP_PROCESSING_SYNC_CHANGES,
+  FIRST_POTENTIAL_CALLSITE_ON_LOAD,
   FIRST_POTENTIAL_CALLSITE_FIND_NEW_DSP_SYNCING,
-  FIRST_POTENTIAL_CALLSITE_ON_LOAD,
+  FIRST_POTENTIAL_CALLSITE_FIND_NEW_DSP_NOT_SYNCING,
   FIRST_POTENTIAL_CALLSITE_MAX,
 };
 
 TemplateURL* FirstPotentialDefaultEngine(
     const TemplateURLService::TemplateURLVector& template_urls) {
   for (TemplateURLService::TemplateURLVector::const_iterator i(
        template_urls.begin()); i != template_urls.end(); ++i) {
     if ((*i)->ShowInDefaultList()) {
       DCHECK(!(*i)->IsExtensionKeyword());
       return *i;
@@ skipping 497 matching lines @@
   scoped_ptr<TemplateURL> prepopulated_default(
       TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(profile_));
   for (TemplateURLVector::iterator i = template_urls_.begin();
        i != template_urls_.end(); ++i) {
     if ((*i)->prepopulate_id() == prepopulated_default->prepopulate_id())
       return *i;
   }
   // If not, use the first non-extension keyword of the templates that supports
   // search term replacement.
   if (processing_syncer_changes_) {
-    UMA_HISTOGRAM_ENUMERATION(kFirstPotentialEngineHistogramName,
-                              FIRST_POTENTIAL_CALLSITE_FIND_NEW_DSP_SYNCING,
-                              FIRST_POTENTIAL_CALLSITE_MAX);
+    UMA_HISTOGRAM_ENUMERATION(
+        kFirstPotentialEngineHistogramName,
+        FIRST_POTENTIAL_CALLSITE_FIND_NEW_DSP_PROCESSING_SYNC_CHANGES,
+        FIRST_POTENTIAL_CALLSITE_MAX);
   } else {
-    UMA_HISTOGRAM_ENUMERATION(kFirstPotentialEngineHistogramName,
-                              FIRST_POTENTIAL_CALLSITE_FIND_NEW_DSP,
-                              FIRST_POTENTIAL_CALLSITE_MAX);
+    if (sync_processor_.get()) {
+      // We're not currently in a sync cycle, but we're syncing.
+      UMA_HISTOGRAM_ENUMERATION(kFirstPotentialEngineHistogramName,
+                                FIRST_POTENTIAL_CALLSITE_FIND_NEW_DSP_SYNCING,
+                                FIRST_POTENTIAL_CALLSITE_MAX);
+    } else {
+      // We're not syncing at all.
+      UMA_HISTOGRAM_ENUMERATION(
+          kFirstPotentialEngineHistogramName,
+          FIRST_POTENTIAL_CALLSITE_FIND_NEW_DSP_NOT_SYNCING,
+          FIRST_POTENTIAL_CALLSITE_MAX);
+    }
   }
   return FirstPotentialDefaultEngine(template_urls_);
 }
 
 void TemplateURLService::AddObserver(TemplateURLServiceObserver* observer) {
   model_observers_.AddObserver(observer);
 }
 
 void TemplateURLService::RemoveObserver(TemplateURLServiceObserver* observer) {
   model_observers_.RemoveObserver(observer);
@@ skipping 1841 matching lines @@
     // TODO(mpcomplete): If we allow editing extension keywords, then those
     // should be persisted to disk and synced.
     if (template_url->sync_guid().empty() &&
         !template_url->IsExtensionKeyword()) {
       template_url->data_.sync_guid = base::GenerateGUID();
       if (service_.get())
         service_->UpdateKeyword(template_url->data());
     }
   }
 }