Removed access to prefs that does not work on Android

chrome/browser/profiles/profile_impl.h

 // Copyright (c) 2012 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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
 #pragma once
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_impl_io_data.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class ExtensionNavigationObserver;
 class ExtensionSystem;
 class NetPrefObserver;
 class PrefService;
-class PromoResourceService;
 class SSLConfigServiceManager;
 class VisitedLinkEventListener;
 
+#if !defined(OS_ANDROID)

[Yaron, 2012/04/09 18:31:54]

Change these to ENABLE_PROMO_RESOURCE_SERVICE

[Jerome, 2012/04/09 20:10:52]

Done.

+class PromoResourceService;
+#endif
+
 #if defined(OS_CHROMEOS)
 namespace chromeos {
 class EnterpriseExtensionObserver;
 class LocaleChangeGuard;
 class Preferences;
 }
 #endif
 
 namespace content {
 class SpeechRecognitionPreferences;
@@ skipping 148 matching lines @@
   // pointers to |prefs_| and shall be destructed first.
   scoped_ptr<PrefService> prefs_;
   scoped_ptr<PrefService> otr_prefs_;
   scoped_ptr<VisitedLinkEventListener> visited_link_event_listener_;
   scoped_ptr<VisitedLinkMaster> visited_link_master_;
   ProfileImplIOData::Handle io_data_;
   scoped_refptr<ExtensionSpecialStoragePolicy>
       extension_special_storage_policy_;
   scoped_ptr<NetPrefObserver> net_pref_observer_;
   scoped_ptr<BookmarkModel> bookmark_bar_model_;
+
+#if !defined(OS_ANDROID)
   scoped_refptr<PromoResourceService> promo_resource_service_;
+#endif
+
   scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry_;
 
   scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;
 
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   scoped_refptr<content::GeolocationPermissionContext>
       geolocation_permission_context_;
   scoped_refptr<content::SpeechRecognitionPreferences>
       speech_recognition_preferences_;
   scoped_ptr<GAIAInfoUpdateService> gaia_info_update_service_;
@@ skipping 51 matching lines @@
   Profile::Delegate* delegate_;
 
   chrome_browser_net::Predictor* predictor_;
 
   bool session_restore_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_