Stop manually calling AddRef/Release for AutocompleteController::providers_

chrome/browser/autocomplete/autocomplete_controller.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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CONTROLLER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
+#include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "components/autocomplete/autocomplete_input.h"
 
 class AutocompleteControllerDelegate;
 class HistoryURLProvider;
@@ skipping 18 matching lines @@
 //
 // IMPORTANT: There is NO THREAD SAFETY built into this portion of the
 // autocomplete system.  All calls to and from the AutocompleteController should
 // happen on the same thread.  AutocompleteProviders are responsible for doing
 // their own thread management when they need to return matches asynchronously.
 //
 // The coordinator for autocomplete queries, responsible for combining the
 // matches from a series of providers into one AutocompleteResult.
 class AutocompleteController : public AutocompleteProviderListener {
  public:
+  typedef std::vector<scoped_refptr<AutocompleteProvider> > Providers;

[Peter Kasting, 2014/07/09 01:07:32]

Any particular reason to declare this here instead of in autocomplete_provider.h
where ACProviders was being declared?  Seems like you could have just updated
that typedef, and eliminated the majority of changes in this CL.

[hashimoto, 2014/07/09 01:57:29]

This typedef is only used as AutocompleteController::providers_ while
AutocompleteProvider is not interested in this type at all.

+
   // |provider_types| is a bitmap containing AutocompleteProvider::Type values
   // that will (potentially, depending on platform, flags, etc.) be
   // instantiated. |template_url_service| is used to create URLs from the
   // autocomplete results.
   AutocompleteController(Profile* profile,
                          TemplateURLService* template_url_service,
                          AutocompleteControllerDelegate* delegate,
                          int provider_types);
   ~AutocompleteController();
 
@@ skipping 63 matching lines @@
 
   // Deprecated. Do not use that method! It's provided temporarily as clank
   // migrates. If you need to access the aucomplete input you should keep a
   // local copy of it.
   // TODO(beaudoin): Remove this method once clank no longer rely on it.
   // crbug.com/367832
   const AutocompleteInput& input() const { return input_; }
 
   const AutocompleteResult& result() const { return result_; }
   bool done() const { return done_; }
-  const ACProviders* providers() const { return &providers_; }
+  const Providers& providers() const { return providers_; }
 
   const base::TimeTicks& last_time_default_match_changed() const {
     return last_time_default_match_changed_;
   }
 
  private:
   friend class AutocompleteProviderTest;
   FRIEND_TEST_ALL_PREFIXES(AutocompleteProviderTest,
                            RedundantKeywordsIgnoredInResult);
   FRIEND_TEST_ALL_PREFIXES(AutocompleteProviderTest, UpdateAssistedQueryStats);
@@ skipping 41 matching lines @@
 
   // Starts |expire_timer_|.
   void StartExpireTimer();
 
   // Starts |stop_timer_|.
   void StartStopTimer();
 
   AutocompleteControllerDelegate* delegate_;
 
   // A list of all providers.
-  ACProviders providers_;
+  Providers providers_;
 
   HistoryURLProvider* history_url_provider_;
 
   KeywordProvider* keyword_provider_;
 
   SearchProvider* search_provider_;
 
   ZeroSuggestProvider* zero_suggest_provider_;
 
   // Input passed to Start.
@@ skipping 34 matching lines @@
   // Are we in Start()? This is used to avoid updating |result_| and sending
   // notifications until Start() has been invoked on all providers.
   bool in_start_;
 
   TemplateURLService* template_url_service_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteController);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_CONTROLLER_H_