Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak…

chrome/browser/autocomplete/search_provider.h

 // 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.
 //
 // This file contains the Search autocomplete provider.  This provider is
 // responsible for all non-keyword autocomplete entries that start with
 // "Search <engine> for ...", including searching for the current input string,
 // search history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 //
@@ skipping 102 matching lines @@
       DCHECK(valid_keyword_provider());
       return cached_keyword_provider_;
     }
 
     // Returns true of the keyword provider is valid.
     bool valid_keyword_provider() const { return !!keyword_provider_; }
 
     // Returns true if the keyword provider is valid and has a valid suggest
     // url.
     bool valid_suggest_for_keyword_provider() const {
-      return keyword_provider_ &&
-          !cached_keyword_provider_.suggestions_url().empty();
+      return keyword_provider_ && cached_keyword_provider_.suggestions_url();
     }
 
     // Returns true of the default provider is valid.
     bool valid_default_provider() const { return !!default_provider_; }
 
     // Returns true if the default provider is valid and has a valid suggest
     // url.
     bool valid_suggest_for_default_provider() const {
-      return default_provider_ &&
-          !cached_default_provider_.suggestions_url().empty();
+      return default_provider_ && cached_default_provider_.suggestions_url();
     }
 
     // Returns true if |from_keyword_provider| is true, or
     // the keyword provider is not valid.
     bool is_primary_provider(bool from_keyword_provider) const {
       return from_keyword_provider || !valid_keyword_provider();
     }
 
    private:
     // Cached across the life of a query so we behave consistently even if the
@@ skipping 185 matching lines @@
   // Has FinalizeInstantQuery been invoked since the last |Start|?
   bool instant_finalized_;
 
   // The |suggest_text| parameter passed to FinalizeInstantQuery.
   string16 default_provider_suggest_text_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_