Cleanup: Remove unneeded scoped_ptr.h includes from ppapi, printing, remoting, and sync.

sync/sessions/sync_session_context.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.
 
 // SyncSessionContext encapsulates the contextual information and engine
 // components specific to a SyncSession. A context is accessible via
 // a SyncSession so that session SyncerCommands and parts of the engine have
 // a convenient way to access other parts. In this way it can be thought of as
 // the surrounding environment for the SyncSession. The components of this
 // environment are either valid or not valid for the entire context lifetime,
 // or they are valid for explicitly scoped periods of time by using Scoped
 // installation utilities found below. This means that the context assumes no
 // ownership whatsoever of any object that was not created by the context
 // itself.
 //
 // It can only be used from the SyncerThread.
 
 #ifndef SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_
 #define SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_
 #pragma once
 
 #include <map>
 #include <string>
+#include <vector>
 
 #include "base/gtest_prod_util.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "sync/engine/model_safe_worker.h"
 #include "sync/engine/syncer_types.h"
 #include "sync/engine/sync_engine_event.h"
 #include "sync/engine/traffic_recorder.h"
 #include "sync/sessions/debug_info_getter.h"
 
 namespace syncable {
 class Directory;
 }
@@ skipping 45 matching lines @@
     return debug_info_getter_;
   }
 
   // Talk notification status.
   void set_notifications_enabled(bool enabled) {
     notifications_enabled_ = enabled;
   }
   bool notifications_enabled() { return notifications_enabled_; }
 
   // Account name, set once a directory has been opened.
-  void set_account_name(const std::string name) {
+  void set_account_name(const std::string& name) {
     DCHECK(account_name_.empty());
     account_name_ = name;
   }
   const std::string& account_name() const { return account_name_; }
 
   void set_max_commit_batch_size(int batch_size) {
     max_commit_batch_size_ = batch_size;
   }
   int32 max_commit_batch_size() const { return max_commit_batch_size_; }
 
@@ skipping 90 matching lines @@
  public:
   // Note: |context| and |resolver| should outlive |this|.
   ScopedSessionContextConflictResolver(SyncSessionContext* context,
                                        ConflictResolver* resolver)
       : context_(context), resolver_(resolver) {
     DCHECK(NULL == context->resolver_);
     context->resolver_ = resolver;
   }
   ~ScopedSessionContextConflictResolver() {
     context_->resolver_ = NULL;
-   }
+  }
+
  private:
   SyncSessionContext* context_;
   ConflictResolver* resolver_;
   DISALLOW_COPY_AND_ASSIGN(ScopedSessionContextConflictResolver);
 };
 
 }  // namespace sessions
 }  // namespace browser_sync
 
 #endif  // SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_