Merge Chromium at 7.0.540.0 : Fix Android autofill code.

Typo fixed in URLFetcher, same fix applied to URLFetcherProxy.

Profile has some new methods, adding stubs to ProfileImplAndroid.

GetAppCacheService, GetFileSystemHostContext:
http://src.chromium.org/viewvc/chrome?view=rev&revision=55773

GetStatusTray:
http://src.chromium.org/viewvc/chrome?view=rev&revision=56596

GetBlobStorageContext:
http://src.chromium.org/viewvc/chrome?view=rev&revision=57707

GetProfileSynService (extra parameter):
http://src.chromium.org/viewvc/chrome?view=rev&revision=58993

Change-Id: I508c899a2af3bf095115855e43b5eb191a2ee450

2 files changed, 9 insertions, 4 deletions

diff --git a/android/autofill/profile_android.h b/android/autofill/profile_android.h
index 2af0d6f..8b82bab 100644
--- a/android/autofill/profile_android.h
+++ b/android/autofill/profile_android.h
@@ -36,7 +36,7 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
-#include "chrome/browser/pref_service.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 
 namespace base {
@@ -122,6 +122,7 @@ class ProfileImplAndroid : public Profile {
   virtual Profile* GetOffTheRecordProfile() { NOTREACHED(); return NULL; }
   virtual void DestroyOffTheRecordProfile() { NOTREACHED(); }
   virtual bool HasOffTheRecordProfile() { NOTREACHED(); return false; }
+  virtual ChromeAppCacheService* GetAppCacheService() { NOTREACHED(); return NULL; }
   virtual webkit_database::DatabaseTracker* GetDatabaseTracker() { NOTREACHED(); return NULL; }
   virtual history::TopSites* GetTopSites() { NOTREACHED(); return NULL; }
   virtual VisitedLinkMaster* GetVisitedLinkMaster() { NOTREACHED(); return NULL; }
@@ -142,6 +143,7 @@ class ProfileImplAndroid : public Profile {
   virtual TemplateURLModel* GetTemplateURLModel() { NOTREACHED(); return NULL; }
   virtual TemplateURLFetcher* GetTemplateURLFetcher() { NOTREACHED(); return NULL; }
   virtual DownloadManager* GetDownloadManager() { NOTREACHED(); return NULL; }
+  virtual FileSystemHostContext* GetFileSystemHostContext() { NOTREACHED(); return NULL; }
   virtual void InitThemes() { NOTREACHED(); }
   virtual void SetTheme(Extension* extension) { NOTREACHED(); }
   virtual void SetNativeTheme() { NOTREACHED(); }
@@ -175,13 +177,16 @@ class ProfileImplAndroid : public Profile {
   virtual WebKitContext* GetWebKitContext()  { NOTREACHED(); return NULL; }
   virtual DesktopNotificationService* GetDesktopNotificationService() { NOTREACHED(); return NULL; }
   virtual BackgroundContentsService* GetBackgroundContentsService()  { NOTREACHED(); return NULL; }
+  virtual StatusTray* GetStatusTray() { NOTREACHED(); return NULL; }
   virtual void MarkAsCleanShutdown() { NOTREACHED(); }
   virtual void InitExtensions() { NOTREACHED(); }
   virtual void InitWebResources() { NOTREACHED(); }
   virtual NTPResourceCache* GetNTPResourceCache()  { NOTREACHED(); return NULL; }
   virtual FilePath last_selected_directory() { NOTREACHED(); return FilePath(""); }
   virtual void set_last_selected_directory(const FilePath& path) { NOTREACHED(); }
+  virtual ChromeBlobStorageContext* GetBlobStorageContext() { NOTREACHED(); return NULL; }
   virtual ProfileSyncService* GetProfileSyncService()  { NOTREACHED();  return NULL; }
+  virtual ProfileSyncService* GetProfileSyncService(const std::string&) { NOTREACHED(); return NULL; }
   virtual TokenService* GetTokenService()  { NOTREACHED(); return NULL; }
   void InitSyncService() { NOTREACHED(); }
   virtual CloudPrintProxyService* GetCloudPrintProxyService()  { NOTREACHED(); return NULL; }
diff --git a/android/autofill/url_fetcher_proxy.h b/android/autofill/url_fetcher_proxy.h
index ec548f2..098129b 100644
--- a/android/autofill/url_fetcher_proxy.h
+++ b/android/autofill/url_fetcher_proxy.h
@@ -65,7 +65,7 @@ struct RunnableMethodTraits<class URLFetcherProxy> {
 // Note that we overide the minimum number of methods to allow this
 // class to be used by AutoFillDownloadManager ...
 // - set_upload_data()
-// - set_automatcally_retry_on_5xx()
+// - set_automatically_retry_on_5xx()
 // - Start()
 class URLFetcherProxy : public URLFetcher, public URLFetcher::Delegate {
 public:
@@ -82,7 +82,7 @@ public:
   {
   }
 
-  virtual void set_automatcally_retry_on_5xx(bool retry)
+  virtual void set_automatically_retry_on_5xx(bool retry)
   {
     retry_ = retry;
   }
@@ -128,7 +128,7 @@ private:
   void DoStart()
   {
     real_fetcher_.reset(new URLFetcher(url(), request_type_, this));
-    real_fetcher_->set_automatcally_retry_on_5xx(retry_);
+    real_fetcher_->set_automatically_retry_on_5xx(retry_);
     // We expect set_upload_data() to have been called on this object.
     real_fetcher_->set_upload_data(upload_content_type_, upload_content_);
     real_fetcher_->set_request_context(ProfileImplAndroid::GetDefaultRequestContext());