Porting in browser/webdata and template_url.

chrome/browser/webdata/web_data_service.h

 // Copyright (c) 2006-2008 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_WEBDATA_WEB_DATA_SERVICE_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 
+#include <map>
+
 #include "base/basictypes.h"
 #include "base/lock.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/thread.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/common/scoped_vector.h"
-#include <map>
+#include "webkit/glue/autofill_form.h"
 
-struct AutofillForm::Element;
 struct IE7PasswordInfo;
 struct PasswordForm;
-class AutofillForm;
 class GURL;
 class ShutdownTask;
 class TemplateURL;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataService is a generic data repository for meta data associated with
 // web pages. All data is retrieved and archived in an asynchronous way.
 //
 // All requests return a handle. The handle can be used to cancel the request.
@@ skipping 345 matching lines @@
   void RemoveFormElementsAddedBetween(const base::Time& delete_begin,
                                       const base::Time& delete_end);
 
  protected:
   friend class TemplateURLModelTest;
   friend class TemplateURLModelTestingProfile;
   friend class WebDataServiceTest;
   friend class WebDataRequest;
 
   // This is invoked by the unit test; path is the path of the Web Data file.
-  bool WebDataService::InitWithPath(const std::wstring& path);
+  bool InitWithPath(const std::wstring& path);
 
   // Invoked by request implementations when a request has been processed.
   void RequestCompleted(Handle h);
 
   // Register the request as a pending request.
   void RegisterRequest(WebDataRequest* request);
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // The following methods are only invoked in the web data service thread.
   //
   //////////////////////////////////////////////////////////////////////////////
  private:
   friend class ShutdownTask;
 
   typedef GenericRequest2<std::vector<const TemplateURL*>,
-                          std::vector<TemplateURL*>> SetKeywordsRequest;
+                          std::vector<TemplateURL*> > SetKeywordsRequest;
 
   // Initialize the database with the provided path.
   void InitializeDatabase(const std::wstring& path);
 
   // Commit any pending transaction and deletes the database.
-  void WebDataService::ShutdownDatabase();
+  void ShutdownDatabase();
 
   // Commit the current transaction and creates a new one.
   void Commit();
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Keywords.
   //
   //////////////////////////////////////////////////////////////////////////////
   void AddKeywordImpl(GenericRequest<TemplateURL>* request);
@@ skipping 93 matching lines @@
  public:
 
   // Called when a request is done. h uniquely identifies the request.
   // result can be NULL, if no result is expected or if the database could
   // not be opened. The result object is destroyed after this call.
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result) = 0;
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__