Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e

1 files changed, 11 insertions, 4 deletions

diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index c9bfd849a9..7732d0cf64 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -71,6 +71,7 @@ class SyncSessionSnapshot;
 
 namespace syncer {
 class BaseTransaction;
+class NetworkResources;
 struct SyncCredentials;
 struct UserShare;
 }  // namespace syncer
@@ -461,7 +462,7 @@ class ProfileSyncService
   }
 
   // Returns a user-friendly string form of last synced time (in minutes).
-  virtual string16 GetLastSyncedTimeString() const;
+  virtual base::string16 GetLastSyncedTimeString() const;
 
   // Returns a human readable string describing backend initialization state.
   std::string GetBackendInitializationStateString() const;
@@ -699,10 +700,12 @@ class ProfileSyncService
 
   browser_sync::FaviconCache* GetFaviconCache();
 
- protected:
-  // Used by test classes that derive from ProfileSyncService.
-  virtual browser_sync::SyncBackendHost* GetBackendForTest();
+  // Overrides the NetworkResources used for Sync connections.
+  // This function takes ownership of |network_resources|.
+  void OverrideNetworkResourcesForTest(
+      scoped_ptr<syncer::NetworkResources> network_resources);
 
+ protected:
   // Helper to configure the priority data types.
   void ConfigurePriorityDataTypes();
 
@@ -872,6 +875,8 @@ class ProfileSyncService
                                     bool delete_sync_database,
                                     UnrecoverableErrorReason reason);
 
+  bool IsSessionsDataTypeControllerRunning() const;
+
   // Returns the username (in form of an email address) that should be used in
   // the credentials.
   std::string GetEffectiveUsername();
@@ -1040,6 +1045,8 @@ class ProfileSyncService
 
   scoped_ptr<SessionsSyncManager> sessions_sync_manager_;
 
+  scoped_ptr<syncer::NetworkResources> network_resources_;
+
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };