Move ChangeListLoader, ChangeListProcessor and ChangeListLoaderObserver into internal namespace.

These are classes for drive file system implementation, and we don't want to
touch them from outside of c/b/chromeos/drive/...

BUG=230235
TEST=Ran unit_tests

Review URL: https://chromiumcodereview.appspot.com/15252002

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

10 files changed, 37 insertions, 27 deletions

diff --git a/chrome/browser/chromeos/drive/change_list_loader.cc b/chrome/browser/chromeos/drive/change_list_loader.cc
index f163b95..83e6a3e 100644
--- a/chrome/browser/chromeos/drive/change_list_loader.cc
+++ b/chrome/browser/chromeos/drive/change_list_loader.cc
@@ -24,9 +24,10 @@
 using content::BrowserThread;
 
 namespace drive {
+namespace internal {
 
 ChangeListLoader::ChangeListLoader(
-    internal::ResourceMetadata* resource_metadata,
+    ResourceMetadata* resource_metadata,
     JobScheduler* scheduler,
     DriveWebAppsRegistry* webapps_registry)
     : resource_metadata_(resource_metadata),
@@ -712,4 +713,5 @@ void ChangeListLoader::NotifyDirectoryChangedAfterApplyFeed(
   // on_complete_callback_, which is owned by change_list_processor_.
 }
 
+}  // namespace internal
 }  // namespace drive
diff --git a/chrome/browser/chromeos/drive/change_list_loader.h b/chrome/browser/chromeos/drive/change_list_loader.h
index 0097a89..7af237a 100644
--- a/chrome/browser/chromeos/drive/change_list_loader.h
+++ b/chrome/browser/chromeos/drive/change_list_loader.h
@@ -27,17 +27,17 @@ class ResourceList;
 
 namespace drive {
 
-class ChangeList;
-class ChangeListLoaderObserver;
-class ChangeListProcessor;
 class DirectoryFetchInfo;
 class DriveWebAppsRegistry;
 class JobScheduler;
 class ResourceEntry;
 
 namespace internal {
+
+class ChangeList;
+class ChangeListLoaderObserver;
+class ChangeListProcessor;
 class ResourceMetadata;
-}  // namespace internal
 
 // Callback run as a response to SearchFromServer.
 typedef base::Callback<void(ScopedVector<ChangeList> change_lists,
@@ -47,7 +47,7 @@ typedef base::Callback<void(ScopedVector<ChangeList> change_lists,
 // Documents List API) or Google Drive API and load the cached metadata.
 class ChangeListLoader {
  public:
-  ChangeListLoader(internal::ResourceMetadata* resource_metadata,
+  ChangeListLoader(ResourceMetadata* resource_metadata,
                    JobScheduler* scheduler,
                    DriveWebAppsRegistry* webapps_registry);
   ~ChangeListLoader();
@@ -259,7 +259,7 @@ class ChangeListLoader {
                                             base::Time start_time,
                                             const base::Closure& callback);
 
-  internal::ResourceMetadata* resource_metadata_;  // Not owned.
+  ResourceMetadata* resource_metadata_;  // Not owned.
   JobScheduler* scheduler_;  // Not owned.
   DriveWebAppsRegistry* webapps_registry_;  // Not owned.
   ObserverList<ChangeListLoaderObserver> observers_;
@@ -280,6 +280,7 @@ class ChangeListLoader {
   DISALLOW_COPY_AND_ASSIGN(ChangeListLoader);
 };
 
+}  // namespace internal
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_H_
diff --git a/chrome/browser/chromeos/drive/change_list_loader_observer.h b/chrome/browser/chromeos/drive/change_list_loader_observer.h
index 9b2f4e7..0d8b949 100644
--- a/chrome/browser/chromeos/drive/change_list_loader_observer.h
+++ b/chrome/browser/chromeos/drive/change_list_loader_observer.h
@@ -7,9 +7,10 @@
 
 namespace base {
 class FilePath;
-}
+}  // namespace base
 
 namespace drive {
+namespace internal {
 
 // Interface for classes that need to observe events from ChangeListLoader.
 // All events are notified on UI thread.
@@ -34,6 +35,7 @@ class ChangeListLoaderObserver {
   virtual ~ChangeListLoaderObserver() {}
 };
 
+}  // namespace internal
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_OBSERVER_H_
diff --git a/chrome/browser/chromeos/drive/change_list_processor.cc b/chrome/browser/chromeos/drive/change_list_processor.cc
index 3aae909..4425ed5 100644
--- a/chrome/browser/chromeos/drive/change_list_processor.cc
+++ b/chrome/browser/chromeos/drive/change_list_processor.cc
@@ -18,6 +18,7 @@
 using content::BrowserThread;
 
 namespace drive {
+namespace internal {
 
 namespace {
 
@@ -82,8 +83,7 @@ class ChangeListProcessor::ChangeListToEntryProtoMapUMAStats {
   int num_shared_with_me_entries_;
 };
 
-ChangeListProcessor::ChangeListProcessor(
-    internal::ResourceMetadata* resource_metadata)
+ChangeListProcessor::ChangeListProcessor(ResourceMetadata* resource_metadata)
   : resource_metadata_(resource_metadata),
     largest_changestamp_(0),
     weak_ptr_factory_(this) {
@@ -482,4 +482,5 @@ void ChangeListProcessor::Clear() {
   on_complete_callback_.Reset();
 }
 
+}  // namespace internal
 }  // namespace drive
diff --git a/chrome/browser/chromeos/drive/change_list_processor.h b/chrome/browser/chromeos/drive/change_list_processor.h
index a996dac..48ba989 100644
--- a/chrome/browser/chromeos/drive/change_list_processor.h
+++ b/chrome/browser/chromeos/drive/change_list_processor.h
@@ -27,8 +27,8 @@ namespace drive {
 class ResourceEntry;
 
 namespace internal {
+
 class ResourceMetadata;
-}  // namespace internal
 
 // Class to represent a change list.
 class ChangeList {
@@ -59,7 +59,7 @@ class ChangeListProcessor {
   // Class used to record UMA stats with FeedToEntryProtoMap().
   class ChangeListToEntryProtoMapUMAStats;
 
-  explicit ChangeListProcessor(internal::ResourceMetadata* resource_metadata);
+  explicit ChangeListProcessor(ResourceMetadata* resource_metadata);
   ~ChangeListProcessor();
 
   // Applies the documents feeds to the file system using |resource_metadata_|.
@@ -189,7 +189,7 @@ class ChangeListProcessor {
   // Reset the state of this object.
   void Clear();
 
-  internal::ResourceMetadata* resource_metadata_;  // Not owned.
+  ResourceMetadata* resource_metadata_;  // Not owned.
 
   ResourceEntryMap entry_map_;
   std::set<base::FilePath> changed_dirs_;
@@ -202,6 +202,7 @@ class ChangeListProcessor {
   DISALLOW_COPY_AND_ASSIGN(ChangeListProcessor);
 };
 
+}  // namespace internal
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_PROCESSOR_H_
diff --git a/chrome/browser/chromeos/drive/file_system.cc b/chrome/browser/chromeos/drive/file_system.cc
index fb4d324..f42a428 100644
--- a/chrome/browser/chromeos/drive/file_system.cc
+++ b/chrome/browser/chromeos/drive/file_system.cc
@@ -263,9 +263,8 @@ void FileSystem::ReloadAfterReset(FileError error) {
 }
 
 void FileSystem::SetupChangeListLoader() {
-  change_list_loader_.reset(new ChangeListLoader(resource_metadata_,
-                                                 scheduler_,
-                                                 webapps_registry_));
+  change_list_loader_.reset(new internal::ChangeListLoader(
+      resource_metadata_, scheduler_, webapps_registry_));
   change_list_loader_->AddObserver(this);
 }
 
diff --git a/chrome/browser/chromeos/drive/file_system.h b/chrome/browser/chromeos/drive/file_system.h
index ff2f117..0f1e4d82 100644
--- a/chrome/browser/chromeos/drive/file_system.h
+++ b/chrome/browser/chromeos/drive/file_system.h
@@ -35,20 +35,19 @@ class ResourceEntry;
 
 namespace drive {
 
-class ChangeList;
-class ChangeListLoader;
 class DriveWebAppsRegistry;
 class FileCacheEntry;
 class FileSystemObserver;
 class JobScheduler;
 
 namespace internal {
+class ChangeListLoader;
 class ResourceMetadata;
 }  // namespace internal
 
 // The production implementation of FileSystemInterface.
 class FileSystem : public FileSystemInterface,
-                   public ChangeListLoaderObserver,
+                   public internal::ChangeListLoaderObserver,
                    public file_system::OperationObserver {
  public:
   FileSystem(Profile* profile,
@@ -161,7 +160,9 @@ class FileSystem : public FileSystemInterface,
 
   // Used in tests to update the file system from |feed_list|.
   // See also the comment at ChangeListLoader::UpdateFromFeed().
-  ChangeListLoader* change_list_loader() { return change_list_loader_.get(); }
+  internal::ChangeListLoader* change_list_loader() {
+    return change_list_loader_.get();
+  }
 
  private:
   friend class DriveFileSystemTest;
@@ -466,7 +467,7 @@ class FileSystem : public FileSystemInterface,
   scoped_ptr<PrefChangeRegistrar> pref_registrar_;
 
   // The loader is used to load the change lists.
-  scoped_ptr<ChangeListLoader> change_list_loader_;
+  scoped_ptr<internal::ChangeListLoader> change_list_loader_;
 
   ObserverList<FileSystemObserver> observers_;
 
diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc
index 07bcd1e..0226975 100644
--- a/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc
@@ -59,7 +59,7 @@ class CreateDirectoryOperationTest
         new JobScheduler(profile_.get(), fake_drive_service_.get()));
 
     DriveWebAppsRegistry drive_web_apps_registry;
-    ChangeListLoader change_list_loader(
+    internal::ChangeListLoader change_list_loader(
         metadata_.get(), scheduler_.get(), &drive_web_apps_registry);
 
     // Makes sure the FakeDriveService's content is loaded to the metadata_.
diff --git a/chrome/browser/chromeos/drive/test_util.cc b/chrome/browser/chromeos/drive/test_util.cc
index 51d0c87..30d470f 100644
--- a/chrome/browser/chromeos/drive/test_util.cc
+++ b/chrome/browser/chromeos/drive/test_util.cc
@@ -39,7 +39,7 @@ bool CacheStatesEqual(const FileCacheEntry& a, const FileCacheEntry& b) {
 }
 
 bool LoadChangeFeed(const std::string& relative_path,
-                    ChangeListLoader* change_list_loader,
+                    internal::ChangeListLoader* change_list_loader,
                     bool is_delta_feed,
                     const std::string& root_resource_id,
                     int64 root_feed_changestamp) {
@@ -55,8 +55,8 @@ bool LoadChangeFeed(const std::string& relative_path,
   if (!document_feed.get())
     return false;
 
-  ScopedVector<ChangeList> change_lists;
-  change_lists.push_back(new ChangeList(*document_feed));
+  ScopedVector<internal::ChangeList> change_lists;
+  change_lists.push_back(new internal::ChangeList(*document_feed));
 
   scoped_ptr<google_apis::AboutResource> about_resource(
       new google_apis::AboutResource);
diff --git a/chrome/browser/chromeos/drive/test_util.h b/chrome/browser/chromeos/drive/test_util.h
index 0823e11..8906454 100644
--- a/chrome/browser/chromeos/drive/test_util.h
+++ b/chrome/browser/chromeos/drive/test_util.h
@@ -18,8 +18,11 @@ class IOBuffer;
 
 namespace drive {
 
-class FileCacheEntry;
+namespace internal {
 class ChangeListLoader;
+}  // namespace internal
+
+class FileCacheEntry;
 
 namespace test_util {
 
@@ -43,7 +46,7 @@ bool CacheStatesEqual(const FileCacheEntry& a, const FileCacheEntry& b);
 // Loads a test json file as root ("/drive") element from a test file stored
 // under chrome/test/data/chromeos. Returns true on success.
 bool LoadChangeFeed(const std::string& relative_path,
-                    ChangeListLoader* change_list_loader,
+                    internal::ChangeListLoader* change_list_loader,
                     bool is_delta_feed,
                     const std::string& root_resource_id,
                     int64 root_feed_changestamp);