Fix memory leak in AutocompleteProviderTest::GetDestinationURL unit test.

chrome/browser/autocomplete/autocomplete_provider_unittest.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/autocomplete/autocomplete_provider.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
@@ skipping 236 matching lines @@
 
   TestProvider* provider2 = new TestProvider(
       kResultsPerProvider * 2,
       same_destinations ? ASCIIToUTF16("http://a") : ASCIIToUTF16("http://b"),
       &profile_,
       string16());
   provider2->AddRef();
   providers.push_back(provider2);
 
   // Reset the controller to contain our new providers.
-  controller_.reset(
-      new AutocompleteController(&profile_, NULL,
-                                 AutocompleteProvider::TYPE_SEARCH));
+  controller_.reset(new AutocompleteController(&profile_, NULL, 0));
+  // We're going to swap the providers vector, but the old vector should be
+  // empty so no elements need to be freed at this point.
+  EXPECT_TRUE(controller_->providers_.empty());

[Peter Kasting, 2013/02/12 01:34:49]

Why don't we just use one of the STL util functions to free the elements anyway?
 Then there's no need for any explanation and the code is more future-proof.

[H Fung, 2013/02/12 02:19:45]

I tried to use STLDeleteElements(&controller_->providers_);
but unfortunately, ~AutocompleteProvider() is protected.  I could copy-paste
that code to do nothing, but I didn't think it was worth it.

   controller_->providers_.swap(providers);
   provider1->set_listener(controller_.get());
   provider2->set_listener(controller_.get());
 
   // The providers don't complete synchronously, so listen for "result updated"
   // notifications.
   registrar_.Add(this,
                  chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
                  content::Source<AutocompleteController>(controller_.get()));
 
@@ skipping 282 matching lines @@
       { AutocompleteMatch::SEARCH_SUGGEST, "chrome.5.57j58j5l2j0l3j59" },
       { AutocompleteMatch::SEARCH_SUGGEST, "chrome.6.57j58j5l2j0l3j59" },
       { AutocompleteMatch::SEARCH_HISTORY, "chrome.7.57j58j5l2j0l3j59" },
     };
     SCOPED_TRACE("Multiple matches");
     RunAssistedQueryStatsTest(test_data, ARRAYSIZE_UNSAFE(test_data));
   }
 }
 
 TEST_F(AutocompleteProviderTest, GetDestinationURL) {
-  ResetControllerWithTestProviders(false, NULL, NULL);
+  ResetControllerWithKeywordAndSearchProviders();
 
   // For the destination URL to have aqs parameters for query formulation time
   // and the field trial triggered bit, many conditions need to be satisfied.
   AutocompleteMatch match(NULL, 1100, false,
                           AutocompleteMatch::SEARCH_SUGGEST);
   GURL url = controller_->
       GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456));
   EXPECT_TRUE(url.path().empty());
 
   // The protocol needs to be https.
@@ skipping 17 matching lines @@
   EXPECT_TRUE(url.path().empty());
 
   // assisted_query_stats needs to have been previously set.
   match.search_terms_args->assisted_query_stats = "chrome.0.57j58j5l2j0l3j59";
   url = controller_->GetDestinationURL(match,
                                        base::TimeDelta::FromMilliseconds(2456));
   EXPECT_EQ("//aqs=chrome.0.57j58j5l2j0l3j59.2456j0&", url.path());
 
   // Test field trial triggered bit set.
   controller_->search_provider_->field_trial_triggered_in_session_ = true;
+  EXPECT_TRUE(controller_->search_provider_->

[Peter Kasting, 2013/02/12 01:34:49]

Nit: I'd break after ( instead of ->

[H Fung, 2013/02/12 02:19:45]

Done.

+              field_trial_triggered_in_session());
   url = controller_->GetDestinationURL(match,
                                        base::TimeDelta::FromMilliseconds(2456));
   EXPECT_EQ("//aqs=chrome.0.57j58j5l2j0l3j59.2456j1&", url.path());
 }