Reland 87645 with clang fixes.

chrome/browser/sync/glue/frontend_data_type_controller.h

Index: chrome/browser/sync/glue/frontend_data_type_controller.h
diff --git a/chrome/browser/sync/glue/frontend_data_type_controller.h b/chrome/browser/sync/glue/frontend_data_type_controller.h
index 86c3e602270080dc7f99cc03d0361c95af7d6c52..a1a7b01492e591c95b57febbebb33ff123369582 100644
--- a/chrome/browser/sync/glue/frontend_data_type_controller.h
+++ b/chrome/browser/sync/glue/frontend_data_type_controller.h
@@ -15,6 +15,7 @@
 class Profile;
 class ProfileSyncService;
 class ProfileSyncFactory;
+class SyncError;
 
 namespace base { class TimeDelta; }
 namespace browser_sync {
@@ -84,11 +85,11 @@ class FrontendDataTypeController : public DataTypeController {
 
   // Cleans up state and calls callback when start fails.
   virtual void StartFailed(StartResult result,
-      const tracked_objects::Location& from_here);
+                           const tracked_objects::Location& location);
 
   // Helper method to run the stashed start callback with a given result.
   virtual void FinishStart(StartResult result,
-      const tracked_objects::Location& from_here);
+                           const tracked_objects::Location& location);
 
   // DataType specific histogram methods. Because histograms use static's, the
   // specific datatype controllers must implement this themselves.