Merge Chromium at 10.0.621.0: Compile fix for profile_android.h

New method in profile.h, GetPrerenderManager:
http://codereview.chromium.org/6503008

New method in profile.h, GetExtensionService:
http://codereview.chromium.org/5730004

New return type for GetFileSystemContext:
http://codereview.chromium.org/6471018

Change-Id: I45be184acc46ccb120c47084907d080f7b8879ba

1 files changed, 3 insertions, 1 deletions

diff --git a/android/autofill/profile_android.h b/android/autofill/profile_android.h
index 3dd3613..c2e4913 100644
--- a/android/autofill/profile_android.h
+++ b/android/autofill/profile_android.h
@@ -144,6 +144,7 @@ class ProfileImplAndroid : public Profile {
   virtual ExtensionProcessManager* GetExtensionProcessManager() { NOTREACHED(); return NULL; }
   virtual ExtensionMessageService* GetExtensionMessageService() { NOTREACHED(); return NULL; }
   virtual ExtensionEventRouter* GetExtensionEventRouter() { NOTREACHED(); return NULL; }
+  virtual ExtensionService* GetExtensionService() { NOTREACHED(); return NULL; }
   virtual FaviconService* GetFaviconService(ServiceAccessType sat) { NOTREACHED(); return NULL; }
   virtual HistoryService* GetHistoryService(ServiceAccessType sat) { NOTREACHED(); return NULL; }
   virtual HistoryService* GetHistoryServiceWithoutCreating() { NOTREACHED(); return NULL; }
@@ -154,7 +155,7 @@ class ProfileImplAndroid : public Profile {
   virtual TemplateURLModel* GetTemplateURLModel() { NOTREACHED(); return NULL; }
   virtual TemplateURLFetcher* GetTemplateURLFetcher() { NOTREACHED(); return NULL; }
   virtual DownloadManager* GetDownloadManager() { NOTREACHED(); return NULL; }
-  virtual BrowserFileSystemContext* GetFileSystemContext() { NOTREACHED(); return NULL; }
+  virtual fileapi::SandboxedFileSystemContext* GetFileSystemContext() { NOTREACHED(); return NULL; }
   virtual void InitThemes() { NOTREACHED(); }
   virtual void SetTheme(const Extension* extension) { NOTREACHED(); }
   virtual void SetNativeTheme() { NOTREACHED(); }
@@ -210,6 +211,7 @@ class ProfileImplAndroid : public Profile {
 
   virtual policy::ProfilePolicyContext* GetPolicyContext() { NOTREACHED(); return NULL; }
   virtual PrefProxyConfigTracker* GetProxyConfigTracker() { NOTREACHED(); return NULL; }
+  virtual PrerenderManager* GetPrerenderManager() { NOTREACHED(); return NULL; }
 
  private:
   friend class Profile;