Move the URL string from TemplateURLRef onto the owning TemplateURL. This will make it easier to m…

chrome/browser/instant/instant_controller.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/instant/instant_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 511 matching lines @@
                   verbatim, suggested_text);
   UpdateIsDisplayable();
   // For the HIDDEN and SILENT field trials, don't send back suggestions.
   if (!InstantFieldTrial::ShouldSetSuggestedText(tab_contents_->profile()))
     suggested_text->clear();
 }
 
 // Returns true if |template_url| is a valid TemplateURL for use by instant.
 bool InstantController::IsValidInstantTemplateURL(
     const TemplateURL* template_url) {
-  return template_url && template_url->instant_url() && template_url->id() &&

[sky, 2012/03/30 22:00:29]

I think we should keep this id() check. During startup the id() may not be set,
which I think can cause problems later on.

-      template_url->instant_url()->SupportsReplacement() &&
+  return template_url &&
+      template_url->instant_url_ref().SupportsReplacement() &&
       !IsBlacklistedFromInstant(template_url->id());
 }
 
 void InstantController::BlacklistFromInstant() {
   if (!loader_.get())
     return;
 
   DCHECK(loader_->template_url_id());
   blacklisted_ids_.insert(loader_->template_url_id());
 
@@ skipping 15 matching lines @@
   if (!weak_factory_.HasWeakPtrs()) {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&InstantController::DestroyLoaders,
                               weak_factory_.GetWeakPtr()));
   }
 }
 
 void InstantController::DestroyLoaders() {
   loaders_to_destroy_.reset();
 }