Misc formatting / cleanup in the autocomplete code.

- Reformat / reword some comments.
- Update include guards to the new style.
- Remove trailing blank lines from end of files.
- Clean up some includes.
- Pull the CompareQuality functor into the implementation.
- Pull kQueryDelayMs into the implementation.

Review URL: http://codereview.chromium.org/27206


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10603 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 10 deletions

diff --git a/chrome/browser/autocomplete/autocomplete.h b/chrome/browser/autocomplete/autocomplete.h
index d047b62..6f84f02 100644
--- a/chrome/browser/autocomplete/autocomplete.h
+++ b/chrome/browser/autocomplete/autocomplete.h
@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_H_
 
-#include <map>
 #include <string>
 #include <vector>
+
 #include "base/logging.h"
 #include "base/ref_counted.h"
 #include "base/timer.h"
@@ -140,13 +140,13 @@ typedef std::vector<AutocompleteProvider*> ACProviders;
 class AutocompleteInput {
  public:
   enum Type {
-    INVALID,       // Empty input
-    UNKNOWN,       // Valid input whose type cannot be determined
-    REQUESTED_URL, // Input autodetected as UNKNOWN, which the user wants to
-                   // treat as an URL by specifying a desired_tld
-    URL,           // Input autodetected as a URL
-    QUERY,         // Input autodetected as a query
-    FORCED_QUERY,  // Input forced to be a query by an initial '?'
+    INVALID,        // Empty input
+    UNKNOWN,        // Valid input whose type cannot be determined
+    REQUESTED_URL,  // Input autodetected as UNKNOWN, which the user wants to
+                    // treat as an URL by specifying a desired_tld
+    URL,            // Input autodetected as a URL
+    QUERY,          // Input autodetected as a query
+    FORCED_QUERY,   // Input forced to be a query by an initial '?'
   };
 
   AutocompleteInput()
@@ -155,7 +155,7 @@ class AutocompleteInput {
         prefer_keyword_(false),
         synchronous_only_(false) {
   }
-  
+
   AutocompleteInput(const std::wstring& text,
                     const std::wstring& desired_tld,
                     bool prevent_inline_autocomplete,
@@ -733,7 +733,6 @@ class AutocompleteController : public ACProviderListener {
 
   // Copies |latest_result_| to |result_| and notifies observers of updates.
   void CommitResult();
-
   // Returns the matches from |provider| whose destination urls are not in
   // |latest_result_|.
   ACMatches GetMatchesNotInLatestResult(