Moved files related to background mode to browser/background.

BUG=none
TEST=If it compiles, it works.

Review URL: http://codereview.chromium.org/7187028

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

33 files changed, 69 insertions, 68 deletions

diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index b1487df..ba1c846 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -13,7 +13,7 @@
 #include "base/string_number_conversions.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/background_application_list_model.h"
+#include "chrome/browser/background/background_application_list_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/command_updater.h"
diff --git a/chrome/browser/background/OWNERS b/chrome/browser/background/OWNERS
new file mode 100644
index 0000000..3e63b46
--- /dev/null
+++ b/chrome/browser/background/OWNERS
@@ -0,0 +1 @@
+atwilson@chromium.org
diff --git a/chrome/browser/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc
index cddda05..f9092c1 100644
--- a/chrome/browser/background_application_list_model.cc
+++ b/chrome/browser/background/background_application_list_model.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/background_application_list_model.h"
+#include "chrome/browser/background/background_application_list_model.h"
 
 #include <algorithm>
 #include <set>
@@ -10,7 +10,7 @@
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/background_mode_manager.h"
+#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/background_application_list_model.h b/chrome/browser/background/background_application_list_model.h
index 02aea2f..5a0dde2 100644
--- a/chrome/browser/background_application_list_model.h
+++ b/chrome/browser/background/background_application_list_model.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_BACKGROUND_APPLICATION_LIST_MODEL_H_
-#define CHROME_BROWSER_BACKGROUND_APPLICATION_LIST_MODEL_H_
+#ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_APPLICATION_LIST_MODEL_H_
+#define CHROME_BROWSER_BACKGROUND_BACKGROUND_APPLICATION_LIST_MODEL_H_
 #pragma once
 
 #include <map>
@@ -135,4 +135,4 @@ class BackgroundApplicationListModel : public NotificationObserver {
   DISALLOW_COPY_AND_ASSIGN(BackgroundApplicationListModel);
 };
 
-#endif  // CHROME_BROWSER_BACKGROUND_APPLICATION_LIST_MODEL_H_
+#endif  // CHROME_BROWSER_BACKGROUND_BACKGROUND_APPLICATION_LIST_MODEL_H_
diff --git a/chrome/browser/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc
index cb6f548..530c76b 100644
--- a/chrome/browser/background_application_list_model_unittest.cc
+++ b/chrome/browser/background/background_application_list_model_unittest.cc
@@ -7,7 +7,7 @@
 #include <cstdlib>
 #include <set>
 
-#include "chrome/browser/background_application_list_model.h"
+#include "chrome/browser/background/background_application_list_model.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
diff --git a/chrome/browser/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc
index d6de00f..a75712c 100644
--- a/chrome/browser/background_contents_service.cc
+++ b/chrome/browser/background/background_contents_service.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/background_contents_service.h"
+#include "chrome/browser/background/background_contents_service.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/background_contents_service_factory.h"
+#include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/background_contents_service.h b/chrome/browser/background/background_contents_service.h
index 6c5bdc5..6d526cc 100644
--- a/chrome/browser/background_contents_service.h
+++ b/chrome/browser/background/background_contents_service.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_BACKGROUND_CONTENTS_SERVICE_H_
-#define CHROME_BROWSER_BACKGROUND_CONTENTS_SERVICE_H_
+#ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_H_
+#define CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_H_
 #pragma once
 
 #include <map>
@@ -175,4 +175,4 @@ class BackgroundContentsService : private NotificationObserver,
   DISALLOW_COPY_AND_ASSIGN(BackgroundContentsService);
 };
 
-#endif  // CHROME_BROWSER_BACKGROUND_CONTENTS_SERVICE_H_
+#endif  // CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_H_
diff --git a/chrome/browser/background_contents_service_factory.cc b/chrome/browser/background/background_contents_service_factory.cc
index 5171201..51b5ffd 100644
--- a/chrome/browser/background_contents_service_factory.cc
+++ b/chrome/browser/background/background_contents_service_factory.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/background_contents_service_factory.h"
+#include "chrome/browser/background/background_contents_service_factory.h"
 
 #include "base/command_line.h"
-#include "chrome/browser/background_contents_service.h"
+#include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 
diff --git a/chrome/browser/background_contents_service_factory.h b/chrome/browser/background/background_contents_service_factory.h
index 1d240b3..18973a4 100644
--- a/chrome/browser/background_contents_service_factory.h
+++ b/chrome/browser/background/background_contents_service_factory.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_BACKGROUND_CONTENTS_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_BACKGROUND_CONTENTS_SERVICE_FACTORY_H_
+#ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_FACTORY_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
@@ -34,4 +34,4 @@ class BackgroundContentsServiceFactory : public ProfileKeyedServiceFactory {
   virtual bool ServiceHasOwnInstanceInIncognito() OVERRIDE;
 };
 
-#endif  // CHROME_BROWSER_BACKGROUND_CONTENTS_SERVICE_FACTORY_H_
+#endif  // CHROME_BROWSER_BACKGROUND_BACKGROUND_CONTENTS_SERVICE_FACTORY_H_
diff --git a/chrome/browser/background_contents_service_unittest.cc b/chrome/browser/background/background_contents_service_unittest.cc
index ffaa508..e3cf5b5 100644
--- a/chrome/browser/background_contents_service_unittest.cc
+++ b/chrome/browser/background/background_contents_service_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/background_contents_service.h"
+#include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/tab_contents/background_contents.h"
diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index 0e67280..05475b6 100644
--- a/chrome/browser/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -9,8 +9,8 @@
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/background_application_list_model.h"
-#include "chrome/browser/background_mode_manager.h"
+#include "chrome/browser/background/background_application_list_model.h"
+#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/background_mode_manager.h b/chrome/browser/background/background_mode_manager.h
index 2373b27..e2fe568 100644
--- a/chrome/browser/background_mode_manager.h
+++ b/chrome/browser/background/background_mode_manager.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BACKGROUND_MODE_MANAGER_H_
-#define CHROME_BROWSER_BACKGROUND_MODE_MANAGER_H_
+#ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_H_
+#define CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_H_
 #pragma once
 
 #include <map>
 
 #include "base/gtest_prod_util.h"
-#include "chrome/browser/background_application_list_model.h"
+#include "chrome/browser/background/background_application_list_model.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/status_icons/status_icon.h"
@@ -262,4 +262,4 @@ class BackgroundModeManager
   DISALLOW_COPY_AND_ASSIGN(BackgroundModeManager);
 };
 
-#endif  // CHROME_BROWSER_BACKGROUND_MODE_MANAGER_H_
+#endif  // CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_H_
diff --git a/chrome/browser/background_mode_manager_chromeos.cc b/chrome/browser/background/background_mode_manager_chromeos.cc
index 86138b0..cee80ae 100644
--- a/chrome/browser/background_mode_manager_chromeos.cc
+++ b/chrome/browser/background/background_mode_manager_chromeos.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/background_mode_manager.h"
+#include "chrome/browser/background/background_mode_manager.h"
 
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/background_mode_manager_factory.cc b/chrome/browser/background/background_mode_manager_factory.cc
index 9437f3b..393a349 100644
--- a/chrome/browser/background_mode_manager_factory.cc
+++ b/chrome/browser/background/background_mode_manager_factory.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/background_mode_manager_factory.h"
+#include "chrome/browser/background/background_mode_manager_factory.h"
 
 #include "base/command_line.h"
-#include "chrome/browser/background_mode_manager.h"
+#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 
diff --git a/chrome/browser/background_mode_manager_factory.h b/chrome/browser/background/background_mode_manager_factory.h
index 54a3a1a..f4e31fa 100644
--- a/chrome/browser/background_mode_manager_factory.h
+++ b/chrome/browser/background/background_mode_manager_factory.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_BACKGROUND_MODE_MANAGER_FACTORY_H_
-#define CHROME_BROWSER_BACKGROUND_MODE_MANAGER_FACTORY_H_
+#ifndef CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_FACTORY_H_
+#define CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_FACTORY_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
@@ -32,4 +32,4 @@ class BackgroundModeManagerFactory : public ProfileKeyedServiceFactory {
       Profile* profile) const OVERRIDE;
 };
 
-#endif  // CHROME_BROWSER_BACKGROUND_MODE_MANAGER_FACTORY_H_
+#endif  // CHROME_BROWSER_BACKGROUND_BACKGROUND_MODE_MANAGER_FACTORY_H_
diff --git a/chrome/browser/background_mode_manager_linux.cc b/chrome/browser/background/background_mode_manager_linux.cc
index b172633..2b076c1 100644
--- a/chrome/browser/background_mode_manager_linux.cc
+++ b/chrome/browser/background/background_mode_manager_linux.cc
@@ -11,7 +11,7 @@
 #include "base/logging.h"
 #include "base/nix/xdg_util.h"
 #include "base/task.h"
-#include "chrome/browser/background_mode_manager.h"
+#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/auto_start_linux.h"
diff --git a/chrome/browser/background_mode_manager_mac.mm b/chrome/browser/background/background_mode_manager_mac.mm
index f7fad87..5cad595 100644
--- a/chrome/browser/background_mode_manager_mac.mm
+++ b/chrome/browser/background/background_mode_manager_mac.mm
@@ -4,7 +4,7 @@
 
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
-#include "chrome/browser/background_mode_manager.h"
+#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/background_mode_manager_unittest.cc b/chrome/browser/background/background_mode_manager_unittest.cc
index 06477ec..e35408c 100644
--- a/chrome/browser/background_mode_manager_unittest.cc
+++ b/chrome/browser/background/background_mode_manager_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/background_mode_manager.h"
+#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/testing_browser_process.h"
diff --git a/chrome/browser/background_mode_manager_win.cc b/chrome/browser/background/background_mode_manager_win.cc
index 9be2219..7d835a8 100644
--- a/chrome/browser/background_mode_manager_win.cc
+++ b/chrome/browser/background/background_mode_manager_win.cc
@@ -10,7 +10,7 @@
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
-#include "chrome/browser/background_mode_manager.h"
+#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 41c846c..9d9ef1a1 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -16,7 +16,7 @@
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/automation/automation_provider_list.h"
-#include "chrome/browser/background_mode_manager.h"
+#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_main.h"
 #include "chrome/browser/browser_process_sub_thread.h"
 #include "chrome/browser/browser_trial.h"
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index a9ca9d1..356789e 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -4,8 +4,8 @@
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/background_contents_service.h"
-#include "chrome/browser/background_contents_service_factory.h"
+#include "chrome/browser/background/background_contents_service.h"
+#include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 14b6fbc..1d9f0ed 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -6,8 +6,8 @@
 
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/autofill/autofill_manager.h"
-#include "chrome/browser/background_contents_service.h"
-#include "chrome/browser/background_mode_manager.h"
+#include "chrome/browser/background/background_contents_service.h"
+#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index b61febd..5c31834 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -14,7 +14,7 @@
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
-#include "chrome/browser/background_contents_service_factory.h"
+#include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_manager.h"
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index bce27ee..3a00e7b 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -16,8 +16,8 @@
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
-#include "chrome/browser/background_contents_service_factory.h"
-#include "chrome/browser/background_mode_manager.h"
+#include "chrome/browser/background/background_contents_service_factory.h"
+#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_signin.h"
diff --git a/chrome/browser/tab_contents/background_contents.cc b/chrome/browser/tab_contents/background_contents.cc
index 61db9d5..5898b55 100644
--- a/chrome/browser/tab_contents/background_contents.cc
+++ b/chrome/browser/tab_contents/background_contents.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/tab_contents/background_contents.h"
 
-#include "chrome/browser/background_contents_service.h"
+#include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 54edfda..9f6f388 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -9,8 +9,8 @@
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/background_contents_service.h"
-#include "chrome/browser/background_contents_service_factory.h"
+#include "chrome/browser/background/background_contents_service.h"
+#include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index a8709b9..35c8e96 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -12,8 +12,8 @@
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/background_contents_service.h"
-#include "chrome/browser/background_contents_service_factory.h"
+#include "chrome/browser/background/background_contents_service.h"
+#include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 3d2de6e..1f274ff 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -6,8 +6,8 @@
 
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/background_contents_service.h"
-#include "chrome/browser/background_contents_service_factory.h"
+#include "chrome/browser/background/background_contents_service.h"
+#include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc
index f385823..a47b503 100644
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc
@@ -14,8 +14,8 @@
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/background_contents_service.h"
-#include "chrome/browser/background_contents_service_factory.h"
+#include "chrome/browser/background/background_contents_service.h"
+#include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 3f8be81..d068364 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -24,7 +24,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autofill/autofill_manager.h"
-#include "chrome/browser/background_contents_service.h"
+#include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 620571e..4e468d4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -252,18 +252,18 @@
         'browser/automation/ui_controls_win.cc',
         'browser/automation/url_request_automation_job.cc',
         'browser/automation/url_request_automation_job.h',
-        'browser/background_application_list_model.cc',
-        'browser/background_application_list_model.h',
-        'browser/background_contents_service.cc',
-        'browser/background_contents_service.h',
-        'browser/background_contents_service_factory.cc',
-        'browser/background_contents_service_factory.h',
-        'browser/background_mode_manager.cc',
-        'browser/background_mode_manager.h',
-        'browser/background_mode_manager_chromeos.cc',
-        'browser/background_mode_manager_linux.cc',
-        'browser/background_mode_manager_mac.mm',
-        'browser/background_mode_manager_win.cc',
+        'browser/background/background_application_list_model.cc',
+        'browser/background/background_application_list_model.h',
+        'browser/background/background_contents_service.cc',
+        'browser/background/background_contents_service.h',
+        'browser/background/background_contents_service_factory.cc',
+        'browser/background/background_contents_service_factory.h',
+        'browser/background/background_mode_manager.cc',
+        'browser/background/background_mode_manager.h',
+        'browser/background/background_mode_manager_chromeos.cc',
+        'browser/background/background_mode_manager_linux.cc',
+        'browser/background/background_mode_manager_mac.mm',
+        'browser/background/background_mode_manager_win.cc',
         'browser/bookmarks/base_bookmark_model_observer.cc',
         'browser/bookmarks/base_bookmark_model_observer.h',
         'browser/bookmarks/bookmark_codec.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index be0c1e3..f5fe921 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1286,9 +1286,9 @@
         'browser/autofill/select_control_handler_unittest.cc',
         'browser/automation/automation_provider_unittest.cc',
         'browser/automation/automation_tab_helper_unittest.cc',
-        'browser/background_application_list_model_unittest.cc',
-        'browser/background_contents_service_unittest.cc',
-        'browser/background_mode_manager_unittest.cc',
+        'browser/background/background_application_list_model_unittest.cc',
+        'browser/background/background_contents_service_unittest.cc',
+        'browser/background/background_mode_manager_unittest.cc',
         'browser/bookmarks/bookmark_codec_unittest.cc',
         'browser/bookmarks/bookmark_context_menu_controller_unittest.cc',
         'browser/bookmarks/bookmark_html_writer_unittest.cc',
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 3d4d927..08dd691 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -13,7 +13,7 @@
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
-#include "chrome/browser/background_contents_service_factory.h"
+#include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"