Move:...

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
===================================================================
--- chrome/chrome_browser.gypi	(revision 68047)
+++ chrome/chrome_browser.gypi	(working copy)
@@ -1189,11 +1189,11 @@
         'browser/fav_icon_helper.h',
         'browser/favicon_service.cc',
         'browser/favicon_service.h',
-        'browser/file_path_watcher.cc',
-        'browser/file_path_watcher.h',
-        'browser/file_path_watcher_inotify.cc',
-        'browser/file_path_watcher_mac.cc',
-        'browser/file_path_watcher_win.cc',
+        'browser/file_path_watcher/file_path_watcher.cc',
+        'browser/file_path_watcher/file_path_watcher.h',
+        'browser/file_path_watcher/file_path_watcher_inotify.cc',
+        'browser/file_path_watcher/file_path_watcher_mac.cc',
+        'browser/file_path_watcher/file_path_watcher_win.cc',
         'browser/file_select_helper.cc',
         'browser/file_select_helper.h',
         'browser/file_system/browser_file_system_context.cc',
@@ -1713,13 +1713,6 @@
         'browser/load_notification_details.h',
         'browser/enumerate_modules_model_win.cc',
         'browser/enumerate_modules_model_win.h',
-        'browser/login_model.h',
-        'browser/login_prompt.cc',
-        'browser/login_prompt.h',
-        'browser/login_prompt_gtk.cc',
-        'browser/login_prompt_mac.h',
-        'browser/login_prompt_mac.mm',
-        'browser/login_prompt_win.cc',
         'browser/mach_broker_mac.cc',
         'browser/mach_broker_mac.h',
         'browser/memory_details.cc',
@@ -2039,14 +2032,14 @@
         'browser/process_singleton_linux.cc',
         'browser/process_singleton_mac.cc',
         'browser/process_singleton_win.cc',
-        'browser/profile.cc',
-        'browser/profile.h',
-        'browser/profile_impl.cc',
-        'browser/profile_impl.h',
-        'browser/profile_import_process_host.cc',
-        'browser/profile_import_process_host.h',
-        'browser/profile_manager.cc',
-        'browser/profile_manager.h',
+        'browser/profiles/profile.cc',
+        'browser/profiles/profile.h',
+        'browser/profiles/profile_impl.cc',
+        'browser/profiles/profile_impl.h',
+        'browser/profiles/profile_import_process_host.cc',
+        'browser/profiles/profile_import_process_host.h',
+        'browser/profiles/profile_manager.cc',
+        'browser/profiles/profile_manager.h',
         'browser/remoting/remoting_resources_source.cc',
         'browser/remoting/remoting_resources_source.h',
         'browser/remoting/remoting_setup_flow.cc',
@@ -2998,6 +2991,13 @@
         'browser/ui/input_window_dialog.h',
         'browser/ui/input_window_dialog_gtk.cc',
         'browser/ui/input_window_dialog_win.cc',
+        'browser/ui/login/login_model.h',
+        'browser/ui/login/login_prompt.cc',
+        'browser/ui/login/login_prompt.h',
+        'browser/ui/login/login_prompt_gtk.cc',
+        'browser/ui/login/login_prompt_mac.h',
+        'browser/ui/login/login_prompt_mac.mm',
+        'browser/ui/login/login_prompt_win.cc',
         'browser/ui/omnibox/location_bar.h',
         'browser/ui/omnibox/location_bar_util.cc',
         'browser/ui/omnibox/location_bar_util.h',
@@ -3399,10 +3399,10 @@
         'browser/user_style_sheet_watcher.h',
         'browser/utility_process_host.cc',
         'browser/utility_process_host.h',
-        'browser/visitedlink_master.cc',
-        'browser/visitedlink_master.h',
-        'browser/visitedlink_event_listener.cc',
-        'browser/visitedlink_event_listener.h',
+        'browser/visitedlink/visitedlink_master.cc',
+        'browser/visitedlink/visitedlink_master.h',
+        'browser/visitedlink/visitedlink_event_listener.cc',
+        'browser/visitedlink/visitedlink_event_listener.h',
         'browser/webdata/autofill_change.cc',
         'browser/webdata/autofill_change.h',
         'browser/webdata/autofill_entry.cc',
@@ -3572,7 +3572,7 @@
             'browser/certificate_manager_model.h',
             'browser/dom_ui/options/certificate_manager_handler.cc',
             'browser/dom_ui/options/certificate_manager_handler.h',
-            'browser/file_path_watcher_inotify.cc',
+            'browser/file_path_watcher/file_path_watcher_inotify.cc',
           ],
         }],
         ['OS=="freebsd" or OS=="openbsd"', {
@@ -3583,7 +3583,7 @@
             '../build/linux/system.gyp:x11',
           ],
           'sources': [
-            'browser/file_path_watcher_stub.cc',
+            'browser/file_path_watcher/file_path_watcher_stub.cc',
           ],
         }],
         # Use system SSL settings on Mac and Windows.  Use preferences