Merge 144583 - sync: fix reentrancy crash in ModelAssociationManager

chrome/browser/sync/glue/model_association_manager.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.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATION_MANAGER_H__
 #define CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATION_MANAGER_H__
 #pragma once
 
 #include <list>
 
@@ skipping 62 matching lines @@
 
   // This is used for TESTING PURPOSE ONLY. The test case can inspect
   // and modify the timer.
   // TODO(sync) : This would go away if we made this class be able to do
   // Dependency injection. crbug.com/129212.
    base::OneShotTimer<ModelAssociationManager>* GetTimerForTesting();
 
  private:
   enum State {
     // This is the state after |Initialize| is called.
-    INITIAILIZED_TO_CONFIGURE,
+    INITIALIZED_TO_CONFIGURE,
     // Starting a new configuration.
     CONFIGURING,
     // A stop command was issued.
     ABORTED,
     // No configuration is in progress.
     IDLE
   };
 
   // Returns true if any requested types currently need to start model
   // association.  If non-null, fills |needs_start| with all such controllers.
@@ skipping 66 matching lines @@
 
   // Set of all registered controllers.
   const DataTypeController::TypeMap* controllers_;
   ModelAssociationResultProcessor* result_processor_;
   base::WeakPtrFactory<ModelAssociationManager> weak_ptr_factory_;
   base::OneShotTimer<ModelAssociationManager> timer_;
   DISALLOW_COPY_AND_ASSIGN(ModelAssociationManager);
 };
 }  // namespace browser_sync
 #endif  // CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATION_MANAGER_H__