Refactor chromeos cros files into subdir 'cros'

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/572012

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

29 files changed, 78 insertions, 78 deletions

diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 4f9b2cb..4c90a4b 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -58,8 +58,8 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/browser_notification_observers.h"
+#include "chrome/browser/chromeos/cros/mount_library.h"
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
-#include "chrome/browser/chromeos/mount_library.h"
 #include "chrome/browser/chromeos/usb_mount_observer.h"
 #include "chrome/browser/views/tabs/tab_overview_message_listener.h"
 #endif
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 5627652..34b4e67 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -125,7 +125,7 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros_library.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/external_cookie_handler.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "chrome/browser/views/browser_dialogs.h"
diff --git a/chrome/browser/chromeos/cros/cros_api.gyp b/chrome/browser/chromeos/cros/cros_api.gyp
new file mode 100644
index 0000000..98cff69
--- /dev/null
+++ b/chrome/browser/chromeos/cros/cros_api.gyp
@@ -0,0 +1,17 @@
+{
+  'targets': [
+    { 'target_name': 'cros_api',
+      'type': '<(library)',
+      'sources': [
+        '../../../../third_party/cros/chromeos_power.h',
+        '../../../../third_party/cros/chromeos_network.h',
+        '../../../../third_party/cros/load.cc',
+      ],
+      'include_dirs': [
+        '../../../../third_party/cros',
+        '../../../../third_party',
+        '../../../..',
+      ],
+    },
+  ],
+ }
diff --git a/chrome/browser/chromeos/cros_library.cc b/chrome/browser/chromeos/cros/cros_library.cc
index 6b342e0..57e00c0 100644
--- a/chrome/browser/chromeos/cros_library.cc
+++ b/chrome/browser/chromeos/cros/cros_library.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/chromeos/cros_library.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
 
 #include <dlfcn.h>
 
diff --git a/chrome/browser/chromeos/cros_library.h b/chrome/browser/chromeos/cros/cros_library.h
index 0872e74..d2d962b 100644
--- a/chrome/browser/chromeos/cros_library.h
+++ b/chrome/browser/chromeos/cros/cros_library.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_CHROMEOS_CROS_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_LIBRARY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROS_CROS_LIBRARY_H_
+#define CHROME_BROWSER_CHROMEOS_CROS_CROS_LIBRARY_H_
 
 #include "base/basictypes.h"
 
@@ -27,4 +27,4 @@ class CrosLibrary {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_CROS_LIBRARY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CROS_CROS_LIBRARY_H_
diff --git a/chrome/browser/chromeos/language_library.cc b/chrome/browser/chromeos/cros/language_library.cc
index dd84245..4dabf85 100644
--- a/chrome/browser/chromeos/language_library.cc
+++ b/chrome/browser/chromeos/cros/language_library.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/language_library.h"
+#include "chrome/browser/chromeos/cros/language_library.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/chromeos/cros_library.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
diff --git a/chrome/browser/chromeos/language_library.h b/chrome/browser/chromeos/cros/language_library.h
index 2cf1674..bf2e242 100644
--- a/chrome/browser/chromeos/language_library.h
+++ b/chrome/browser/chromeos/cros/language_library.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_CHROMEOS_LANGUAGE_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_LANGUAGE_LIBRARY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROS_LANGUAGE_LIBRARY_H_
+#define CHROME_BROWSER_CHROMEOS_CROS_LANGUAGE_LIBRARY_H_
 
 #include <string>
 
@@ -145,5 +145,5 @@ class LanguageLibrary {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LANGUAGE_LIBRARY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CROS_LANGUAGE_LIBRARY_H_
 
diff --git a/chrome/browser/chromeos/login_library.cc b/chrome/browser/chromeos/cros/login_library.cc
index 5a7f1de..8b02f03 100644
--- a/chrome/browser/chromeos/login_library.cc
+++ b/chrome/browser/chromeos/cros/login_library.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/login_library.h"
+#include "chrome/browser/chromeos/cros/login_library.h"
 
 #include "base/message_loop.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/chromeos/cros_library.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
 
 namespace chromeos {
 // static
diff --git a/chrome/browser/chromeos/login_library.h b/chrome/browser/chromeos/cros/login_library.h
index 3904099..653eb12 100644
--- a/chrome/browser/chromeos/login_library.h
+++ b/chrome/browser/chromeos/cros/login_library.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_CHROMEOS_LOGIN_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_LIBRARY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROS_LOGIN_LIBRARY_H_
+#define CHROME_BROWSER_CHROMEOS_CROS_LOGIN_LIBRARY_H_
 
 #include <string>
 
@@ -55,4 +55,4 @@ class LoginLibrary {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LIBRARY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CROS_LOGIN_LIBRARY_H_
diff --git a/chrome/browser/chromeos/mount_library.cc b/chrome/browser/chromeos/cros/mount_library.cc
index 488bc8b..beca30d 100644
--- a/chrome/browser/chromeos/mount_library.cc
+++ b/chrome/browser/chromeos/cros/mount_library.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/mount_library.h"
+#include "chrome/browser/chromeos/cros/mount_library.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/chromeos/cros_library.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
diff --git a/chrome/browser/chromeos/mount_library.h b/chrome/browser/chromeos/cros/mount_library.h
index 2d04aad..376c175 100644
--- a/chrome/browser/chromeos/mount_library.h
+++ b/chrome/browser/chromeos/cros/mount_library.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_CHROMEOS_MOUNT_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_MOUNT_LIBRARY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROS_MOUNT_LIBRARY_H_
+#define CHROME_BROWSER_CHROMEOS_CROS_MOUNT_LIBRARY_H_
 
 #include <string>
 #include <vector>
@@ -95,4 +95,4 @@ class MountLibrary {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_MOUNT_LIBRARY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CROS_MOUNT_LIBRARY_H_
diff --git a/chrome/browser/chromeos/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index a072261..7ce8e6a 100644
--- a/chrome/browser/chromeos/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/network_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 
 #include <algorithm>
 
 #include "base/string_util.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/chromeos/cros_library.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "net/url_request/url_request_job.h"
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
diff --git a/chrome/browser/chromeos/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index 76ed4cf..af66859 100644
--- a/chrome/browser/chromeos/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.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_CHROMEOS_NETWORK_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_NETWORK_LIBRARY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
+#define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 
 #include <string>
 #include <vector>
@@ -260,4 +260,4 @@ class NetworkLibrary : public URLRequestJobTracker::JobObserver {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_NETWORK_LIBRARY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
diff --git a/chrome/browser/chromeos/power_library.cc b/chrome/browser/chromeos/cros/power_library.cc
index 9f7a71a..ea7eaff 100644
--- a/chrome/browser/chromeos/power_library.cc
+++ b/chrome/browser/chromeos/cros/power_library.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/power_library.h"
+#include "chrome/browser/chromeos/cros/power_library.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/chromeos/cros_library.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
diff --git a/chrome/browser/chromeos/power_library.h b/chrome/browser/chromeos/cros/power_library.h
index cf32108..4ee6b85 100644
--- a/chrome/browser/chromeos/power_library.h
+++ b/chrome/browser/chromeos/cros/power_library.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_CHROMEOS_POWER_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_POWER_LIBRARY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROS_POWER_LIBRARY_H_
+#define CHROME_BROWSER_CHROMEOS_CROS_POWER_LIBRARY_H_
 
 #include "base/observer_list.h"
 #include "base/singleton.h"
@@ -82,4 +82,4 @@ class PowerLibrary {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_POWER_LIBRARY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CROS_POWER_LIBRARY_H_
diff --git a/chrome/browser/chromeos/synaptics_library.cc b/chrome/browser/chromeos/cros/synaptics_library.cc
index f68b3ea..c98a9cd 100644
--- a/chrome/browser/chromeos/synaptics_library.cc
+++ b/chrome/browser/chromeos/cros/synaptics_library.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/synaptics_library.h"
+#include "chrome/browser/chromeos/cros/synaptics_library.h"
 
 #include "base/message_loop.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/chromeos/cros_library.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/synaptics_library.h b/chrome/browser/chromeos/cros/synaptics_library.h
index c55be97..0a2db7e 100644
--- a/chrome/browser/chromeos/synaptics_library.h
+++ b/chrome/browser/chromeos/cros/synaptics_library.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_CHROMEOS_SYNAPTICS_LIBRARY_H_
-#define CHROME_BROWSER_CHROMEOS_SYNAPTICS_LIBRARY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROS_SYNAPTICS_LIBRARY_H_
+#define CHROME_BROWSER_CHROMEOS_CROS_SYNAPTICS_LIBRARY_H_
 
 #include "base/singleton.h"
 #include "third_party/cros/chromeos_synaptics.h"
@@ -45,4 +45,4 @@ class SynapticsLibrary {
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYNAPTICS_LIBRARY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CROS_SYNAPTICS_LIBRARY_H_
diff --git a/chrome/browser/chromeos/cros_api.gyp b/chrome/browser/chromeos/cros_api.gyp
deleted file mode 100644
index a3d5fa71..0000000
--- a/chrome/browser/chromeos/cros_api.gyp
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  'targets': [
-    { 'target_name': 'cros_api',
-      'type': '<(library)',
-      'sources': [
-        '../../../third_party/cros/chromeos_power.h',
-        '../../../third_party/cros/chromeos_network.h',
-        '../../../third_party/cros/load.cc',
-      ],
-      'include_dirs': [
-        '../../../third_party/cros',
-        '../../../third_party',
-        '../../..',
-      ],
-    },
-  ],
- }
diff --git a/chrome/browser/chromeos/login_manager_view.cc b/chrome/browser/chromeos/login_manager_view.cc
index 602ff3d..d86bf85 100644
--- a/chrome/browser/chromeos/login_manager_view.cc
+++ b/chrome/browser/chromeos/login_manager_view.cc
@@ -14,9 +14,9 @@
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
+#include "chrome/browser/chromeos/cros/login_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/image_background.h"
-#include "chrome/browser/chromeos/login_library.h"
-#include "chrome/browser/chromeos/network_library.h"
 #include "chrome/browser/chromeos/user_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/chromeos/login_wizard_view.cc b/chrome/browser/chromeos/login_wizard_view.cc
index 53b49a2..969955c 100644
--- a/chrome/browser/chromeos/login_wizard_view.cc
+++ b/chrome/browser/chromeos/login_wizard_view.cc
@@ -15,8 +15,8 @@
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/process_util.h"
+#include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/image_background.h"
-#include "chrome/browser/chromeos/login_library.h"
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/views/browser_dialogs.h"
diff --git a/chrome/browser/chromeos/options/internet_page_view.cc b/chrome/browser/chromeos/options/internet_page_view.cc
index 58f36dc..c280815 100644
--- a/chrome/browser/chromeos/options/internet_page_view.cc
+++ b/chrome/browser/chromeos/options/internet_page_view.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "app/combobox_model.h"
-#include "chrome/browser/chromeos/network_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/status/password_dialog_view.h"
 #include "grit/generated_resources.h"
 #include "views/controls/button/native_button.h"
diff --git a/chrome/browser/chromeos/options/system_page_view.cc b/chrome/browser/chromeos/options/system_page_view.cc
index 8877d3f..d9aaaa1 100644
--- a/chrome/browser/chromeos/options/system_page_view.cc
+++ b/chrome/browser/chromeos/options/system_page_view.cc
@@ -9,7 +9,7 @@
 
 #include "app/combobox_model.h"
 #include "base/stl_util-inl.h"
-#include "chrome/browser/chromeos/language_library.h"
+#include "chrome/browser/chromeos/cros/language_library.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_member.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 89abbdf..b3628b6 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/preferences.h"
 
 #include "base/string_util.h"
-#include "chrome/browser/chromeos/synaptics_library.h"
+#include "chrome/browser/chromeos/cros/synaptics_library.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_member.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/chromeos/status/language_menu_button.h b/chrome/browser/chromeos/status/language_menu_button.h
index 3fed634..3c0a88b 100644
--- a/chrome/browser/chromeos/status/language_menu_button.h
+++ b/chrome/browser/chromeos/status/language_menu_button.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_STATUS_LANGUAGE_MENU_BUTTON_H_
 
 #include "app/menus/simple_menu_model.h"
-#include "chrome/browser/chromeos/language_library.h"
+#include "chrome/browser/chromeos/cros/language_library.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/view_menu_delegate.h"
diff --git a/chrome/browser/chromeos/status/network_menu_button.h b/chrome/browser/chromeos/status/network_menu_button.h
index b38c142..1ae4c80 100644
--- a/chrome/browser/chromeos/status/network_menu_button.h
+++ b/chrome/browser/chromeos/status/network_menu_button.h
@@ -10,7 +10,7 @@
 
 #include "app/throb_animation.h"
 #include "base/timer.h"
-#include "chrome/browser/chromeos/network_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/status/password_dialog_view.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "views/controls/menu/menu_2.h"
diff --git a/chrome/browser/chromeos/status/power_menu_button.h b/chrome/browser/chromeos/status/power_menu_button.h
index 58612f3..5ac9e0b 100644
--- a/chrome/browser/chromeos/status/power_menu_button.h
+++ b/chrome/browser/chromeos/status/power_menu_button.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_STATUS_POWER_MENU_BUTTON_H_
 
 #include "app/menus/menu_model.h"
-#include "chrome/browser/chromeos/power_library.h"
+#include "chrome/browser/chromeos/cros/power_library.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/view_menu_delegate.h"
diff --git a/chrome/browser/chromeos/usb_mount_observer.h b/chrome/browser/chromeos/usb_mount_observer.h
index 84a8fe2..7f11444 100644
--- a/chrome/browser/chromeos/usb_mount_observer.h
+++ b/chrome/browser/chromeos/usb_mount_observer.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "chrome/browser/chromeos/mount_library.h"
+#include "chrome/browser/chromeos/cros/mount_library.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc
index dfc5ed5..103ab07 100644
--- a/chrome/browser/dom_ui/filebrowse_ui.cc
+++ b/chrome/browser/dom_ui/filebrowse_ui.cc
@@ -39,7 +39,7 @@
 #include "grit/locale_settings.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/mount_library.h"
+#include "chrome/browser/chromeos/cros/mount_library.h"
 #endif
 
 // Maximum number of search results to return in a given search. We should
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 8a53875..0875c3f 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -265,8 +265,20 @@
         'browser/chromeos/compact_location_bar_view.h',
         'browser/chromeos/compact_navigation_bar.cc',
         'browser/chromeos/compact_navigation_bar.h',
-        'browser/chromeos/cros_library.cc',
-        'browser/chromeos/cros_library.h',
+        'browser/chromeos/cros/cros_library.cc',
+        'browser/chromeos/cros/cros_library.h',
+        'browser/chromeos/cros/language_library.cc',
+        'browser/chromeos/cros/language_library.h',
+        'browser/chromeos/cros/login_library.cc',
+        'browser/chromeos/cros/login_library.h',
+        'browser/chromeos/cros/mount_library.cc',
+        'browser/chromeos/cros/mount_library.h',
+        'browser/chromeos/cros/network_library.cc',
+        'browser/chromeos/cros/network_library.h',
+        'browser/chromeos/cros/power_library.cc',
+        'browser/chromeos/cros/power_library.h',
+        'browser/chromeos/cros/synaptics_library.cc',
+        'browser/chromeos/cros/synaptics_library.h',
         'browser/chromeos/external_cookie_handler.cc',
         'browser/chromeos/external_cookie_handler.h',
         'browser/chromeos/external_metrics.cc',
@@ -276,20 +288,12 @@
         'browser/chromeos/gview_request_interceptor.cc',
         'browser/chromeos/gview_request_interceptor.h',
         'browser/chromeos/ipc_message.h',
-        'browser/chromeos/language_library.cc',
-        'browser/chromeos/language_library.h',
-        'browser/chromeos/login_library.cc',
-        'browser/chromeos/login_library.h',
         'browser/chromeos/login_manager_view.cc',
         'browser/chromeos/login_manager_view.h',
         'browser/chromeos/login_wizard_view.cc',
         'browser/chromeos/login_wizard_view.h',
         'browser/chromeos/main_menu.cc',
         'browser/chromeos/main_menu.h',
-        'browser/chromeos/mount_library.cc',
-        'browser/chromeos/mount_library.h',
-        'browser/chromeos/network_library.cc',
-        'browser/chromeos/network_library.h',
         'browser/chromeos/options/internet_page_view.cc',
         'browser/chromeos/options/internet_page_view.h',
         'browser/chromeos/options/settings_page_view.cc',
@@ -308,8 +312,6 @@
         'browser/chromeos/panels/panel_scroller_header.h',
         'browser/chromeos/pipe_reader.cc',
         'browser/chromeos/pipe_reader.h',
-        'browser/chromeos/power_library.cc',
-        'browser/chromeos/power_library.h',
         'browser/chromeos/preferences.cc',
         'browser/chromeos/preferences.h',
         'browser/chromeos/status/browser_status_area_view.cc',
@@ -329,8 +331,6 @@
         'browser/chromeos/status/status_area_host.h',
         'browser/chromeos/status/status_area_view.cc',
         'browser/chromeos/status/status_area_view.h',
-        'browser/chromeos/synaptics_library.cc',
-        'browser/chromeos/synaptics_library.h',
         'browser/chromeos/usb_mount_observer.cc',
         'browser/chromeos/usb_mount_observer.h',
         'browser/chromeos/user_manager.cc',