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

chrome/browser/sync/test/integration/two_client_search_engines_sync_test.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 "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/search_engines_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
@@ skipping 135 matching lines @@
   DisableVerifier();
   ASSERT_TRUE(AllServicesMatch());
 
   // Add a different search engine to each client, but make their keywords
   // conflict.
   AddSearchEngine(0, 0);
   AddSearchEngine(1, 1);
   const TemplateURL* turl = GetServiceForProfile(1)->GetTemplateURLForKeyword(
       ASCIIToUTF16("test1"));
   EXPECT_TRUE(turl);
-  GetServiceForProfile(1)->ResetTemplateURL(turl, turl->short_name(),
-                                            ASCIIToUTF16("test0"), turl->url());
+  GetServiceForProfile(1)->ResetTemplateURL(turl,
+                                            turl->short_name(),
+                                            ASCIIToUTF16("test0"),
+                                            turl->url()->url());
 
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllServicesMatch());
 }
 
 // TCM ID - 9004187.
 IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, MergeMultiple) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   DisableVerifier();
   ASSERT_TRUE(AllServicesMatch());
@@ skipping 65 matching lines @@
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(AllServicesMatch());
 
   // Change the default on the first client and delete the old default.
   ChangeDefaultSearchProvider(0, 1);
   DeleteSearchEngineBySeed(0, 0);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   ASSERT_TRUE(AllServicesMatch());
 }