Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: components/sync/base/proto_value_ptr.h

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync/base/model_type.h ('k') | components/sync/core/activation_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/base/proto_value_ptr.h
diff --git a/components/sync/base/proto_value_ptr.h b/components/sync/base/proto_value_ptr.h
index dbf046dd2c2b224827dc0c2b4727393fd62606c6..0f97323ea9927bebe93153a452cc8392ae89d0e6 100644
--- a/components/sync/base/proto_value_ptr.h
+++ b/components/sync/base/proto_value_ptr.h
@@ -8,10 +8,10 @@
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
-namespace syncer {
+namespace syncer_v2 {
struct EntityData;
class ProcessorEntityTracker;
-} // namespace syncer
+} // namespace syncer_v2
namespace syncer {
@@ -91,8 +91,8 @@ class ProtoValuePtr {
private:
friend struct syncable::EntryKernel;
- friend struct EntityData;
- friend class ProcessorEntityTracker;
+ friend struct syncer_v2::EntityData;
+ friend class syncer_v2::ProcessorEntityTracker;
FRIEND_TEST_ALL_PREFIXES(ProtoValuePtrTest, ValueAssignment);
FRIEND_TEST_ALL_PREFIXES(ProtoValuePtrTest, ValueSwap);
FRIEND_TEST_ALL_PREFIXES(ProtoValuePtrTest, SharingTest);
« no previous file with comments | « components/sync/base/model_type.h ('k') | components/sync/core/activation_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698