diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 07:26:59 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 07:26:59 +0000 |
| commit | 71f40a766274aec0a473b4a757d85abf42ad6718 (patch) | |
| tree | db12c877f109d4c61c8fc4fc1a338ec4cf97fc89 /sync | |
| parent | 5f5f84c60b6883dc5b3c7eaeba6c66c0ac63daca (diff) | |
| download | chromium_src-71f40a766274aec0a473b4a757d85abf42ad6718.zip chromium_src-71f40a766274aec0a473b4a757d85abf42ad6718.tar.gz chromium_src-71f40a766274aec0a473b4a757d85abf42ad6718.tar.bz2 | |
Cleanup: Remove unneeded scoped_ptr.h includes from ppapi, printing, remoting, and sync.
BUG=none
TEST=none
TBR=brettw,hclam,akalin,abodenha
Review URL: https://chromiumcodereview.appspot.com/10387107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/engine/syncer.h | 1 | ||||
| -rw-r--r-- | sync/internal_api/all_status.h | 2 | ||||
| -rw-r--r-- | sync/sessions/sync_session_context.h | 7 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sync/engine/syncer.h b/sync/engine/syncer.h index 13fc681..86af488 100644 --- a/sync/engine/syncer.h +++ b/sync/engine/syncer.h @@ -11,7 +11,6 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" -#include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "sync/engine/conflict_resolver.h" #include "sync/engine/syncer_types.h" diff --git a/sync/internal_api/all_status.h b/sync/internal_api/all_status.h index 9887533..0f1d5b0 100644 --- a/sync/internal_api/all_status.h +++ b/sync/internal_api/all_status.h @@ -10,9 +10,9 @@ #pragma once #include <map> +#include <string> #include "base/compiler_specific.h" -#include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "sync/engine/syncer_types.h" #include "sync/engine/sync_engine_event.h" diff --git a/sync/sessions/sync_session_context.h b/sync/sessions/sync_session_context.h index 117afc4..12a9a44 100644 --- a/sync/sessions/sync_session_context.h +++ b/sync/sessions/sync_session_context.h @@ -21,9 +21,9 @@ #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" @@ -89,7 +89,7 @@ class SyncSessionContext { 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; } @@ -200,7 +200,8 @@ class ScopedSessionContextConflictResolver { } ~ScopedSessionContextConflictResolver() { context_->resolver_ = NULL; - } + } + private: SyncSessionContext* context_; ConflictResolver* resolver_; |