Update defaults for InstantExtended.

chrome/browser/search/instant_service.cc

 // Copyright 2013 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/instant_service.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ skipping 51 matching lines @@
 }
 
 }  // namespace
 
 InstantService::InstantService(Profile* profile)
     : profile_(profile),
       ntp_prerenderer_(profile, this, profile->GetPrefs()),
       browser_instant_controller_object_count_(0),
       weak_ptr_factory_(this) {
   // Stub for unit tests.
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI))
+  if (!BrowserThread::CurrentlyOn(BrowserThread::UI) ||
+      base::MessageLoop::current()->type() != base::MessageLoop::TYPE_UI)
     return;
 
   registrar_.Add(this,
                  content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  content::NotificationService::AllSources());
 
   history::TopSites* top_sites = profile_->GetTopSites();
   if (top_sites) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_TOP_SITES_CHANGED,
@@ skipping 366 matching lines @@
     // could cause that, neither of which we support.
     return;
   }
   FOR_EACH_OBSERVER(
       InstantServiceObserver, observers_, DefaultSearchProviderChanged());
 }
 
 InstantNTPPrerenderer* InstantService::ntp_prerenderer() {
   return &ntp_prerenderer_;
 }