Media Galleries API Picasa: Move Picasa source files to correct location.

Depends on: https://codereview.chromium.org/23499006/

R=vandebo
BUG=151701

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

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

chrome/browser/media_galleries/fileapi/media_file_system_backend.cc

@@ -33,7 +33,7 @@
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 #include "chrome/browser/media_galleries/fileapi/itunes_file_util.h"
-#include "chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.h"
+#include "chrome/browser/media_galleries/fileapi/picasa_file_util.h"
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 using fileapi::FileSystemContext;

chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.cc → chrome/browser/media_galleries/fileapi/picasa_data_provider.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h"
+#include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h"
 
 #include <utility>
 

chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h → chrome/browser/media_galleries/fileapi/picasa_data_provider.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_PICASA_DATA_PROVIDER_H_
-#define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_PICASA_DATA_PROVIDER_H_
+#ifndef CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_DATA_PROVIDER_H_
+#define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_DATA_PROVIDER_H_
 
 #include <map>
 #include <queue>
@@ -118,4 +118,4 @@ class PicasaDataProvider {
 
 }  // namespace picasa
 
-#endif  // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_PICASA_DATA_PROVIDER_H_
+#endif  // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_DATA_PROVIDER_H_

chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider_browsertest.cc → chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc

@@ -10,7 +10,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
-#include "chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h"
+#include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h"
 #include "chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h"
 #include "chrome/common/media_galleries/picasa_types.h"
 #include "chrome/common/media_galleries/pmp_test_helper.h"

chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.cc → chrome/browser/media_galleries/fileapi/picasa_file_util.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.h"
+#include "chrome/browser/media_galleries/fileapi/picasa_file_util.h"
 
 #include <string>
 #include <vector>
@@ -14,7 +14,7 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
-#include "chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h"
+#include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h"
 #include "chrome/browser/media_galleries/imported_media_gallery_registry.h"
 #include "chrome/common/media_galleries/picasa_types.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.h → chrome/browser/media_galleries/fileapi/picasa_file_util.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_PICASA_FILE_UTIL_H_
-#define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_PICASA_FILE_UTIL_H_
+#ifndef CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_FILE_UTIL_H_
+#define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_FILE_UTIL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -75,4 +75,4 @@ class PicasaFileUtil : public chrome::NativeMediaFileUtil {
 
 }  // namespace picasa
 
-#endif  // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_PICASA_FILE_UTIL_H_
+#endif  // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_FILE_UTIL_H_

chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc → chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc

@@ -20,8 +20,8 @@
 #include "base/time/time.h"
 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
 #include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
-#include "chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h"
-#include "chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.h"
+#include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h"
+#include "chrome/browser/media_galleries/fileapi/picasa_file_util.h"
 #include "chrome/common/media_galleries/picasa_types.h"
 #include "chrome/common/media_galleries/pmp_constants.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/media_galleries/fileapi/picasa/picasa_finder.cc → chrome/browser/media_galleries/fileapi/picasa_finder.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/media_galleries/fileapi/picasa/picasa_finder.h"
+#include "chrome/browser/media_galleries/fileapi/picasa_finder.h"
 
 #include "base/base_paths.h"
 #include "base/bind.h"

chrome/browser/media_galleries/fileapi/picasa/picasa_finder.h → chrome/browser/media_galleries/fileapi/picasa_finder.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_PICASA_FINDER_H_
-#define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_PICASA_FINDER_H_
+#ifndef CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_FINDER_H_
+#define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_FINDER_H_
 
 #include <string>
 
@@ -24,4 +24,4 @@ void FindPicasaDatabase(const DeviceIDCallback& callback);
 
 }  // namespace picasa
 
-#endif  // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_PICASA_FINDER_H_
+#endif  // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_FINDER_H_

chrome/browser/media_galleries/imported_media_gallery_registry.cc

@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "chrome/browser/media_galleries/fileapi/itunes_data_provider.h"
 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
-#include "chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.h"
+#include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/browser/fileapi/isolated_context.h"

chrome/browser/media_galleries/media_galleries_preferences.cc

@@ -17,7 +17,7 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/media_galleries/fileapi/itunes_finder.h"
-#include "chrome/browser/media_galleries/fileapi/picasa/picasa_finder.h"
+#include "chrome/browser/media_galleries/fileapi/picasa_finder.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"

chrome/chrome_browser.gypi

@@ -1043,8 +1043,8 @@
         'browser/media_galleries/fileapi/mtp_device_map_service.h',
         'browser/media_galleries/fileapi/native_media_file_util.cc',
         'browser/media_galleries/fileapi/native_media_file_util.h',
-        'browser/media_galleries/fileapi/picasa/picasa_finder.cc',
-        'browser/media_galleries/fileapi/picasa/picasa_finder.h',
+        'browser/media_galleries/fileapi/picasa_finder.cc',
+        'browser/media_galleries/fileapi/picasa_finder.h',
         'browser/media_galleries/fileapi/safe_audio_video_checker.cc',
         'browser/media_galleries/fileapi/safe_audio_video_checker.h',
         'browser/media_galleries/fileapi/safe_itunes_pref_parser_win.cc',
@@ -2579,10 +2579,10 @@
             'browser/media_galleries/fileapi/itunes_data_provider.h',
             'browser/media_galleries/fileapi/itunes_file_util.cc',
             'browser/media_galleries/fileapi/itunes_file_util.h',
-            'browser/media_galleries/fileapi/picasa/picasa_data_provider.cc',
-            'browser/media_galleries/fileapi/picasa/picasa_data_provider.h',
-            'browser/media_galleries/fileapi/picasa/picasa_file_util.cc',
-            'browser/media_galleries/fileapi/picasa/picasa_file_util.h',
+            'browser/media_galleries/fileapi/picasa_data_provider.cc',
+            'browser/media_galleries/fileapi/picasa_data_provider.h',
+            'browser/media_galleries/fileapi/picasa_file_util.cc',
+            'browser/media_galleries/fileapi/picasa_file_util.h',
             'browser/media_galleries/fileapi/safe_itunes_library_parser.cc',
             'browser/media_galleries/fileapi/safe_itunes_library_parser.h',
             'browser/media_galleries/fileapi/safe_itunes_pref_parser_win.cc',

chrome/chrome_tests.gypi

@@ -2068,7 +2068,7 @@
         ['OS=="mac" or OS=="win"', {
           'sources': [
             'browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc',
-            'browser/media_galleries/fileapi/picasa/picasa_data_provider_browsertest.cc',
+            'browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc',
           ],
         }],
         ['os_posix == 0 or chromeos == 1', {

chrome/chrome_tests_unit.gypi

@@ -2373,7 +2373,7 @@
         ['OS=="win" or OS=="mac"', {
           'sources': [
             'browser/media_galleries/fileapi/itunes_file_util_unittest.cc',
-            'browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc',
+            'browser/media_galleries/fileapi/picasa_file_util_unittest.cc',
             'utility/media_galleries/itunes_library_parser_unittest.cc',
             'utility/media_galleries/picasa_album_table_reader_unittest.cc',
             'utility/media_galleries/picasa_albums_indexer_unittest.cc',