Revert 151829 - Fix gdata includes.

chrome/browser/chromeos/gdata/gdata_directory_service.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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DIRECTORY_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DIRECTORY_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
-#include "base/file_path.h"
+#include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
-
-namespace base {
-class SequencedTaskRunner;
-}
+#include "base/platform_file.h"
+#include "base/synchronization/lock.h"
+#include "chrome/browser/chromeos/gdata/gdata_files.h"
+#include "chrome/browser/chromeos/gdata/gdata_uploader.h"
+#include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
+#include "chrome/browser/profiles/profile_keyed_service.h"
+#include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
 namespace gdata {
 
-struct CreateDBParams;
-class DocumentEntry;
-class GDataEntry;
-class GDataEntryProto;
-class GDataFile;
-class GDataDirectory;
-class ResourceMetadataDB;
-
-typedef std::vector<GDataEntryProto> GDataEntryProtoVector;
-
-// File type on the gdata file system can be either a regular file or
-// a hosted document.
-enum GDataFileType {
-  REGULAR_FILE,
-  HOSTED_DOCUMENT,
-};
-
 // The root directory content origin.
 enum ContentOrigin {
   UNINITIALIZED,
   // Content is currently loading from somewhere.  Needs to wait.
   INITIALIZING,
   // Content is initialized, but during refreshing.
   REFRESHING,
   // Content is initialized from disk cache.
   FROM_CACHE,
   // Content is initialized from the direct server response.
@@ skipping 254 matching lines @@
   // invalidate its weak pointers before other members are destroyed.
   base::WeakPtrFactory<GDataDirectoryService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataDirectoryService);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DIRECTORY_SERVICE_H_