Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

chrome/browser/sync/glue/model_association_manager.cc

 // 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.
 
 #include "chrome/browser/sync/glue/model_association_manager.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/debug/trace_event.h"
@@ skipping 162 matching lines @@
   GetControllersNeedingStart(&needs_start_);
   // Sort these according to kStartOrder.
   std::sort(needs_start_.begin(),
             needs_start_.end(),
             SortComparator(&start_order_));
 
   // Add any data type controllers into that needs_stop_ list that are
   // currently MODEL_STARTING, ASSOCIATING, RUNNING or DISABLED.
   for (DataTypeController::TypeMap::const_iterator it = controllers_->begin();
        it != controllers_->end(); ++it) {
-    DataTypeController* dtc = (*it).second;
-    if (!desired_types.Has(dtc->type()) && (
-            dtc->state() == DataTypeController::MODEL_STARTING ||
-            dtc->state() == DataTypeController::ASSOCIATING ||
-            dtc->state() == DataTypeController::RUNNING ||
-            dtc->state() == DataTypeController::DISABLED)) {
+    DataTypeController* dtc = (*it).second.get();
+    if (!desired_types.Has(dtc->type()) &&
+        (dtc->state() == DataTypeController::MODEL_STARTING ||
+         dtc->state() == DataTypeController::ASSOCIATING ||
+         dtc->state() == DataTypeController::RUNNING ||
+         dtc->state() == DataTypeController::DISABLED)) {
       needs_stop_.push_back(dtc);
       DVLOG(1) << "ModelTypeToString: Will stop " << dtc->name();
     }
   }
   // Sort these according to kStartOrder.
   std::sort(needs_stop_.begin(),
             needs_stop_.end(),
             SortComparator(&start_order_));
 }
 
@@ skipping 59 matching lines @@
     // We are in the midle of model association. We need to inform the caller
     // so the caller can send notificationst to PSS layer.
     need_to_call_model_association_done = true;
   }
 
   // Now continue stopping any types that have already started.
   DCHECK(state_ == IDLE ||
          state_ == INITIALIZED_TO_CONFIGURE);
   for (DataTypeController::TypeMap::const_iterator it = controllers_->begin();
        it != controllers_->end(); ++it) {
-    DataTypeController* dtc = (*it).second;
+    DataTypeController* dtc = (*it).second.get();
     if (dtc->state() != DataTypeController::NOT_RUNNING &&
         dtc->state() != DataTypeController::STOPPING) {
       dtc->Stop();
       DVLOG(1) << "ModelAssociationManager: Stopped " << dtc->name();
     }
   }
 
   if (need_to_call_model_association_done) {
     DVLOG(1) << "ModelAssociationManager: Calling OnModelAssociationDone";
     DataTypeManager::ConfigureResult result(DataTypeManager::ABORTED,
@@ skipping 301 matching lines @@
   }
   return result;
 }
 
 base::OneShotTimer<ModelAssociationManager>*
     ModelAssociationManager::GetTimerForTesting() {
   return &timer_;
 }
 
 }  // namespace browser_sync