Componentize SearchProvider

components/omnibox/search_provider.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.
 //
 // This file contains the Search autocomplete provider.  This provider is
 // responsible for all autocomplete entries that start with "Search <engine>
 // for ...", including searching for the current input string, search
 // history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 
-#ifndef CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_
-#define CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_
+#ifndef COMPONENTS_OMNIBOX_SEARCH_PROVIDER_H_
+#define COMPONENTS_OMNIBOX_SEARCH_PROVIDER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/autocomplete/answers_cache.h"
-#include "chrome/browser/autocomplete/base_search_provider.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
+#include "components/omnibox/answers_cache.h"
+#include "components/omnibox/base_search_provider.h"
 #include "components/search_engines/template_url.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 class AutocompleteProviderDelegate;
 class AutocompleteProviderListener;
 class AutocompleteResult;
 class SearchProviderTest;
 class TemplateURLService;
 
 namespace history {
@@ skipping 325 matching lines @@
   std::string current_token_;
   base::TimeTicks token_expiration_time_;
 
   // Answers prefetch management.
   AnswersCache answers_cache_;  // Cache for last answers seen.
   AnswersQueryData prefetch_data_;  // Data to use for query prefetching.
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
-#endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_
+#endif  // COMPONENTS_OMNIBOX_SEARCH_PROVIDER_H_