Revert 56939 - History provider: style cleanup...

chrome/browser/autocomplete/history_url_provider.h

 // Copyright (c) 2010 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_HISTORY_URL_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_URL_PROVIDER_H_
 #pragma once
 
+#include <vector>
+
 #include "chrome/browser/autocomplete/autocomplete.h"
-#include "chrome/browser/autocomplete/history_provider_util.h"
+#include "chrome/browser/history/history_types.h"
 
 class MessageLoop;
 class Profile;
 
 namespace history {
-
-class HistoryBackend;
-class URLDatabase;
-class URLRow;
-
+  class HistoryBackend;
 }  // namespace history
 
 // How history autocomplete works
 // ==============================
 //
 // Read down this diagram for temporal ordering.
 //
 //   Main thread                History thread
 //   -----------                --------------
 //   AutocompleteController::Start
@@ skipping 95 matching lines @@
 //
 // Note: This object can get leaked on shutdown if there are pending
 // requests on the database (which hold a reference to us). Normally, these
 // messages get flushed for each thread. We do a round trip from main, to
 // history, back to main while holding a reference. If the main thread
 // completes before the history thread, the message to delegate back to the
 // main thread will not run and the reference will leak. Therefore, don't do
 // anything on destruction.
 class HistoryURLProvider : public AutocompleteProvider {
  public:
-  HistoryURLProvider(ACProviderListener* listener, Profile* profile);
+  HistoryURLProvider(ACProviderListener* listener, Profile* profile)
+      : AutocompleteProvider(listener, profile, "HistoryURL"),
+        prefixes_(GetPrefixes()),
+        params_(NULL) {
+  }
 
 #ifdef UNIT_TEST
   HistoryURLProvider(ACProviderListener* listener,
                      Profile* profile,
-                     const std::wstring& languages);
+                     const std::wstring& languages)
+      : AutocompleteProvider(listener, profile, "History"),
+        prefixes_(GetPrefixes()),
+        params_(NULL),
+        languages_(languages) {
+  }
 #endif
   // no destructor (see note above)
 
   // AutocompleteProvider
   virtual void Start(const AutocompleteInput& input,
                      bool minimal_changes);
   virtual void Stop();
   virtual void DeleteMatch(const AutocompleteMatch& match);
 
   // Runs the history query on the history thread, called by the history
@@ skipping 135 matching lines @@
                      size_t max_results) const;
 
   // Helper function for CullRedirects, this removes all but the first
   // occurance of [any of the set of strings in |remove|] from the |matches|
   // list.
   //
   // The return value is the index of the item that is after the item in the
   // input identified by |source_index|. If |source_index| or an item before
   // is removed, the next item will be shifted, and this allows the caller to
   // pick up on the next one when this happens.
-  size_t RemoveSubsequentMatchesOf(history::HistoryMatches* matches,
-                                   size_t source_index,
-                                   const std::vector<GURL>& remove) const;
+  size_t RemoveSubsequentMatchesOf(
+      history::HistoryMatches* matches,
+      size_t source_index,
+      const std::vector<GURL>& remove) const;
 
   // Converts a line from the database into an autocomplete match for display.
   AutocompleteMatch HistoryMatchToACMatch(
       HistoryURLProviderParams* params,
       const history::HistoryMatch& history_match,
       MatchType match_type,
       size_t match_number);
 
   // Prefixes to try appending to user input when looking for a match.
   const history::Prefixes prefixes_;
 
   // Params for the current query.  The provider should not free this directly;
   // instead, it is passed as a parameter through the history backend, and the
   // parameter itself is freed once it's no longer needed.  The only reason we
   // keep this member is so we can set the cancel bit on it.
   HistoryURLProviderParams* params_;
 
   // Only used by unittests; if non-empty, overrides accept-languages in the
   // profile's pref system.
   std::wstring languages_;
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_URL_PROVIDER_H_