Merge Chromium at 9.0.597.55: Add missing Profile stubs.

See http://src.chromium.org/viewvc/chrome?view=rev&revision=66948
and http://src.chromium.org/viewvc/chrome?view=rev&revision=67261

Change-Id: I6f9cdd1c4ee084fd3675fca612bba7007c1d076c

1 files changed, 8 insertions, 0 deletions

diff --git a/android/autofill/profile_android.h b/android/autofill/profile_android.h
index b7a9545..3dd3613 100644
--- a/android/autofill/profile_android.h
+++ b/android/autofill/profile_android.h
@@ -52,6 +52,10 @@ class TransportSecurityState;
 class SSLConfigService;
 }
 
+namespace policy {
+class ProfilePolicyContext;
+}
+
 namespace webkit_database {
 class DatabaseTracker;
 }
@@ -81,6 +85,7 @@ class NTPResourceCache;
 class PasswordStore;
 class PersonalDataManager;
 class PinnedTabService;
+class PrefProxyConfigTracker;
 class PromoCounter;
 class ProfileSyncService;
 class ProfileSyncFactory;
@@ -203,6 +208,9 @@ class ProfileImplAndroid : public Profile {
   virtual BrowserSignin* GetBrowserSignin() { NOTREACHED(); return NULL; }
   virtual bool HasProfileSyncService() const { NOTREACHED(); return false; }
 
+  virtual policy::ProfilePolicyContext* GetPolicyContext() { NOTREACHED(); return NULL; }
+  virtual PrefProxyConfigTracker* GetProxyConfigTracker() { NOTREACHED(); return NULL; }
+
  private:
   friend class Profile;