[sync] Componentize sync: Part 7: Eliminate more filename collisions in sync.gyp

In order to move src/sync into its own compoent, all the static_library
targets in sync.gyp need to be converted to targets of type 'none' and
rolled into one sync target of type component. This is currently blocked
by duplicate .cc filenames in syncable and internal_api, which flags an
error while running gyp. The offending files are
{internal_api|syncable}/delete_journal.cc.

This patch renames syncable/delete_journal.{h|cc} to
syncable/syncable_delete_journal.{h|cc}.

This is a continuation of https://codereview.chromium.org/11638018.

BUG=136928

Review URL: https://codereview.chromium.org/12033084

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178639 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 11 insertions, 12 deletions

diff --git a/sync/sync.gyp b/sync/sync.gyp
index 4a58afb..144d6b9 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -127,8 +127,6 @@
         'sessions/sync_session_context.cc',
         'sessions/sync_session_context.h',
         'syncable/blob.h',
-        'syncable/delete_journal.cc',
-        'syncable/delete_journal.h',
         'syncable/dir_open_result.h',
         'syncable/directory.cc',
         'syncable/directory.h',
@@ -159,6 +157,8 @@
         'syncable/syncable_base_transaction.h',
         'syncable/syncable_changes_version.h',
         'syncable/syncable_columns.h',
+        'syncable/syncable_delete_journal.cc',
+        'syncable/syncable_delete_journal.h',
         'syncable/syncable_enum_conversions.cc',
         'syncable/syncable_enum_conversions.h',
         'syncable/syncable_id.cc',
diff --git a/sync/syncable/directory.cc b/sync/syncable/directory.cc
index 3400c85..69edfb0 100644
--- a/sync/syncable/directory.cc
+++ b/sync/syncable/directory.cc
@@ -1,4 +1,4 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -10,7 +10,6 @@
 #include "base/string_number_conversions.h"
 #include "sync/internal_api/public/base/node_ordinal.h"
 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
-#include "sync/syncable/delete_journal.h"
 #include "sync/syncable/entry.h"
 #include "sync/syncable/entry_kernel.h"
 #include "sync/syncable/in_memory_directory_backing_store.h"
diff --git a/sync/syncable/directory.h b/sync/syncable/directory.h
index 5f2ae90..6aa10b2 100644
--- a/sync/syncable/directory.h
+++ b/sync/syncable/directory.h
@@ -1,4 +1,4 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
@@ -14,11 +14,11 @@
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/util/report_unrecoverable_error_function.h"
 #include "sync/internal_api/public/util/weak_handle.h"
-#include "sync/syncable/delete_journal.h"
 #include "sync/syncable/dir_open_result.h"
 #include "sync/syncable/entry_kernel.h"
 #include "sync/syncable/metahandle_set.h"
 #include "sync/syncable/scoped_kernel_lock.h"
+#include "sync/syncable/syncable_delete_journal.h"
 
 namespace syncer {
 
diff --git a/sync/syncable/delete_journal.cc b/sync/syncable/syncable_delete_journal.cc
index 1f92def..0aa04fa 100644
--- a/sync/syncable/delete_journal.cc
+++ b/sync/syncable/syncable_delete_journal.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "sync/syncable/delete_journal.h"
+#include "sync/syncable/syncable_delete_journal.h"
 
 #include "base/stl_util.h"
 #include "sync/internal_api/public/base/model_type.h"
diff --git a/sync/syncable/delete_journal.h b/sync/syncable/syncable_delete_journal.h
index 5b9d044..7d4224f 100644
--- a/sync/syncable/delete_journal.h
+++ b/sync/syncable/syncable_delete_journal.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 SYNC_SYNCABLE_DELETE_JOURNAL_H_
-#define SYNC_SYNCABLE_DELETE_JOURNAL_H_
+#ifndef SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_
+#define SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_
 
 #include <set>
 
@@ -100,4 +100,4 @@ class DeleteJournal {
 }  // namespace syncable
 }  // namespace syncer
 
-#endif  // SYNC_SYNCABLE_DELETE_JOURNAL_H_
+#endif  // SYNC_SYNCABLE_SYNCABLE_DELETE_JOURNAL_H_