Reland r56483 - Monitor network change in GoogleURLTracker

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/command_line.h"
+#include "base/environment.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/common/env_vars.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/net_util.h"
 
 using base::Time;
 
 // String in the URL that is replaced by the search term.
 static const char kSearchTermParameter[] = "{searchTerms}";
@@ skipping 89 matching lines @@
 
     // TemplateURLModel ends up owning the TemplateURL, don't try and free it.
     TemplateURL* template_url = new TemplateURL();
     template_url->set_keyword(initializers[i].keyword);
     template_url->set_short_name(initializers[i].content);
     template_url->SetURL(osd_url, 0, 0);
     Add(template_url);
   }
 
   // Request a server check for the correct Google URL if Google is the default
-  // search engine.
+  // search engine, not in headless mode and not in Chrome Frame.
   const TemplateURL* default_provider = GetDefaultSearchProvider();
-  if (default_provider) {
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  if (default_provider && !env->HasVar(env_vars::kHeadless) &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(switches::kCrhomeFrame)) {
     const TemplateURLRef* default_provider_ref = default_provider->url();
     if (default_provider_ref && default_provider_ref->HasGoogleBaseURLs())
       GoogleURLTracker::RequestServerCheck();
   }
 }
 
 // static
 std::wstring TemplateURLModel::GenerateKeyword(const GURL& url,
                                                bool autodetected) {
   // Don't autogenerate keywords for referrers that are the result of a form
@@ skipping 964 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;
 }