Merge Chromium at r66597: Stub new Profile methods on Android

http://src.chromium.org/viewvc/chrome?view=rev&revision=65506
http://src.chromium.org/viewvc/chrome?view=rev&revision=65690
http://src.chromium.org/viewvc/chrome?view=rev&revision=66187

Change-Id: I8e1ed0a22166fa99f6b66a897c44ecce9d6a00e5

1 files changed, 4 insertions, 2 deletions

diff --git a/android/autofill/profile_android.h b/android/autofill/profile_android.h
index f9c6828..1117636 100644
--- a/android/autofill/profile_android.h
+++ b/android/autofill/profile_android.h
@@ -81,6 +81,7 @@ class NTPResourceCache;
 class PasswordStore;
 class PersonalDataManager;
 class PinnedTabService;
+class PromoCounter;
 class ProfileSyncService;
 class ProfileSyncFactory;
 class SessionService;
@@ -145,7 +146,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 BrowserFileSystemContext* GetFileSystemContext() { NOTREACHED(); return NULL; }
   virtual void InitThemes() { NOTREACHED(); }
   virtual void SetTheme(const Extension* extension) { NOTREACHED(); }
   virtual void SetNativeTheme() { NOTREACHED(); }
@@ -178,7 +179,7 @@ class ProfileImplAndroid : public Profile {
   virtual void ReinitializeSpellCheckHost(bool force) { NOTREACHED(); }
   virtual WebKitContext* GetWebKitContext()  { NOTREACHED(); return NULL; }
   virtual DesktopNotificationService* GetDesktopNotificationService() { NOTREACHED(); return NULL; }
-  virtual BackgroundContentsService* GetBackgroundContentsService()  { NOTREACHED(); return NULL; }
+  virtual BackgroundContentsService* GetBackgroundContentsService() const { NOTREACHED(); return NULL; }
   virtual StatusTray* GetStatusTray() { NOTREACHED(); return NULL; }
   virtual void MarkAsCleanShutdown() { NOTREACHED(); }
   virtual void InitExtensions() { NOTREACHED(); }
@@ -188,6 +189,7 @@ class ProfileImplAndroid : public Profile {
   virtual void set_last_selected_directory(const FilePath& path) { NOTREACHED(); }
   virtual ChromeBlobStorageContext* GetBlobStorageContext() { NOTREACHED(); return NULL; }
   virtual ExtensionInfoMap* GetExtensionInfoMap() { NOTREACHED(); return NULL; }
+  virtual PromoCounter* GetInstantPromoCounter() { NOTREACHED(); return NULL; }
   virtual ProfileSyncService* GetProfileSyncService()  { NOTREACHED();  return NULL; }
   virtual ProfileSyncService* GetProfileSyncService(const std::string&) { NOTREACHED(); return NULL; }
   virtual TokenService* GetTokenService()  { NOTREACHED(); return NULL; }