| Index: components/sync/driver/sync_error_controller.h
 | 
| diff --git a/components/sync/driver/sync_error_controller.h b/components/sync/driver/sync_error_controller.h
 | 
| index fcb59497e36ce023a6515ac00347add28fc96539..4aceeab644601b08c1a1a637394fcad7fd27758a 100644
 | 
| --- a/components/sync/driver/sync_error_controller.h
 | 
| +++ b/components/sync/driver/sync_error_controller.h
 | 
| @@ -10,12 +10,12 @@
 | 
|  #include "base/observer_list.h"
 | 
|  #include "components/sync/driver/sync_service_observer.h"
 | 
|  
 | 
| -namespace syncer {
 | 
| -
 | 
| +namespace sync_driver {
 | 
|  class SyncService;
 | 
| +}
 | 
|  
 | 
|  // Keep track of sync errors and expose them to observers in the UI.
 | 
| -class SyncErrorController : public SyncServiceObserver {
 | 
| +class SyncErrorController : public sync_driver::SyncServiceObserver {
 | 
|   public:
 | 
|    // The observer class for SyncErrorController lets the controller notify
 | 
|    // observers when an error arises or changes.
 | 
| @@ -25,7 +25,7 @@ class SyncErrorController : public SyncServiceObserver {
 | 
|      virtual void OnErrorChanged() = 0;
 | 
|    };
 | 
|  
 | 
| -  explicit SyncErrorController(SyncService* service);
 | 
| +  explicit SyncErrorController(sync_driver::SyncService* service);
 | 
|    ~SyncErrorController() override;
 | 
|  
 | 
|    // True if there exists an error worth elevating to the user.
 | 
| @@ -34,16 +34,14 @@ class SyncErrorController : public SyncServiceObserver {
 | 
|    void AddObserver(Observer* observer);
 | 
|    void RemoveObserver(Observer* observer);
 | 
|  
 | 
| -  // SyncServiceObserver:
 | 
| +  // sync_driver::SyncServiceObserver:
 | 
|    void OnStateChanged() override;
 | 
|  
 | 
|   private:
 | 
| -  SyncService* service_;
 | 
| +  sync_driver::SyncService* service_;
 | 
|    base::ObserverList<Observer, true> observer_list_;
 | 
|  
 | 
|    DISALLOW_COPY_AND_ASSIGN(SyncErrorController);
 | 
|  };
 | 
|  
 | 
| -}  // namespace syncer
 | 
| -
 | 
|  #endif  // COMPONENTS_SYNC_DRIVER_SYNC_ERROR_CONTROLLER_H_
 | 
| 
 |