Revert 56939 - History provider: style cleanup...

chrome/browser/autocomplete/history_url_provider.cc

 // 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.
 
 #include "chrome/browser/autocomplete/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/histogram.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_parse.h"
 #include "googleurl/src/url_util.h"
 #include "net/base/net_util.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
+// TODO(mrossetti): Move these to a more appropriate place.
 using history::Prefix;
 using history::Prefixes;
 using history::HistoryMatch;
 using history::HistoryMatches;
 
 namespace history {
 
 // Returns true if |url| is just a host (e.g. "http://www.google.com/") and
 // not some other subpage (e.g. "http://www.google.com/foo.html").
 bool IsHostOnly(const GURL& url) {
@@ skipping 66 matching lines @@
     bool trim_http,
     const std::wstring& languages)
     : message_loop(MessageLoop::current()),
       input(input),
       trim_http(trim_http),
       cancel(false),
       failed(false),
       languages(languages) {
 }
 
-HistoryURLProvider::HistoryURLProvider(ACProviderListener* listener,
-                                       Profile* profile)
-    : AutocompleteProvider(listener, profile, "HistoryURL"),
-      prefixes_(GetPrefixes()),
-      params_(NULL) {
-}
-
-#ifdef UNIT_TEST
-HistoryURLProvider::HistoryURLProvider(ACProviderListener* listener,
-                                       Profile* profile,
-                                       const std::wstring& languages)
-    : AutocompleteProvider(listener, profile, "History"),
-      prefixes_(GetPrefixes()),
-      params_(NULL),
-      languages_(languages) {
-}
-#endif
-
 void HistoryURLProvider::Start(const AutocompleteInput& input,
                                bool minimal_changes) {
   // NOTE: We could try hard to do less work in the |minimal_changes| case
   // here; some clever caching would let us reuse the raw matches from the
   // history DB without re-querying.  However, we'd still have to go back to
   // the history thread to mark these up properly, and if pass 2 is currently
   // running, we'd need to wait for it to return to the main thread before
   // doing this (we can't just write new data for it to read due to thread
   // safety issues).  At that point it's just as fast, and easier, to simply
   // re-run the query from scratch and ignore |minimal_changes|.
@@ skipping 650 matching lines @@
       else
         ++j;
     }
   }
 }
 
 void HistoryURLProvider::CullPoorMatches(HistoryMatches* matches) const {
   Time recent_threshold = history::AutocompleteAgeThreshold();
   for (HistoryMatches::iterator i(matches->begin()); i != matches->end();) {
     const history::URLRow& url_info(i->url_info);
-    if ((url_info.typed_count() <= history::kLowQualityMatchTypedLimit) &&
-        (url_info.visit_count() <= history::kLowQualityMatchVisitLimit) &&
+    if ((url_info.typed_count() <=
+             history::kLowQualityMatchTypedLimit) &&
+        (url_info.visit_count() <=
+             history::kLowQualityMatchVisitLimit) &&
         (url_info.last_visit() < recent_threshold)) {
       i = matches->erase(i);
     } else {
       ++i;
     }
   }
 }
 
 void HistoryURLProvider::CullRedirects(history::HistoryBackend* backend,
                                        HistoryMatches* matches,
@@ skipping 97 matching lines @@
         &match.contents_class);
   }
   match.description = UTF16ToWide(info.title());
   AutocompleteMatch::ClassifyMatchInString(params->input.text(),
                                            UTF16ToWide(info.title()),
                                            ACMatchClassification::NONE,
                                            &match.description_class);
 
   return match;
 }