Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.

chrome/browser/chrome_browser_main_linux.cc

 // 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.
 
 #include "chrome/browser/chrome_browser_main_linux.h"
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/media_gallery/media_device_notifications_linux.h"
 #endif
 
 #if defined(USE_LINUX_BREAKPAD)
 #include <stdlib.h>
 
 #include "base/linux_util.h"
 #include "chrome/app/breakpad_linux.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros_settings.h"
-#include "chrome/browser/chromeos/cros_settings_names.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
+#include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #endif
 
 #endif  // defined(USE_LINUX_BREAKPAD)
 
 namespace {
 
 #if defined(USE_LINUX_BREAKPAD)
 void GetLinuxDistroCallback() {
@@ skipping 68 matching lines @@
 void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
 #if !defined(OS_CHROMEOS)
   // Release it now. Otherwise the FILE thread would be gone when we try to
   // release it in the dtor and Valgrind would report a leak on almost ever
   // single browser_test.
   media_device_notifications_linux_ = NULL;
 #endif
 
   ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
 }