Revert 83062 - Move WebUI ntp files into new ntp directory.And add myself to an ntp watchlist.BUG=noneTEST=trybotsReview URL: http://codereview.chromium.org/6883154

TBR=estade@chromium.org
Review URL: http://codereview.chromium.org/6903039

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

36 files changed, 89 insertions, 96 deletions

diff --git a/WATCHLISTS b/WATCHLISTS
index 9ebd5f3..ae4bdb3 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -143,13 +143,6 @@
                   'chrome/browser/resources/options.html|'\
                   'chrome/browser/dom_ui/options/.*',
     },
-    'ntp' : {
-      'filepath': 'chrome/browser/resources/ntp/.*|'\
-        'chrome/browser/resources/ntp4/.*|'\
-        'chrome/browser/resources/touch_ntp/.*|'\
-        'chrome/browser/resources/touch_ntp/.*|'\
-        'chrome/browser/ui/webui/ntp/.*',
-    },
     'cookie_monster': {
       'filepath': 'net/base/cookie_.*|'\
         'chrome/browser/net/sqlite_persistent_cookie_store.*',
@@ -266,7 +259,6 @@
                  'sergeyu+watch@chromium.org',
                  'simonmorris+watch@chromium.org',
                  'wez+watch@chromium.org'],
-    'ntp': ['estade+watch@chromium.org'],
     'cookie_monster': ['rdsmith@chromium.org'],
     'autofill': ['dhollowa@chromium.org', 'georgey@chromium.org',
                  'isherman@chromium.org'],
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 03c8cba..a26d14b 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -80,7 +80,7 @@
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/active_downloads_ui.h"
-#include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/extensions/apps_promo_unittest.cc b/chrome/browser/extensions/apps_promo_unittest.cc
index cbfa1ba..d6c3bac 100644
--- a/chrome/browser/extensions/apps_promo_unittest.cc
+++ b/chrome/browser/extensions/apps_promo_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/logging.h"
 #include "chrome/browser/extensions/apps_promo.h"
 #include "chrome/browser/prefs/browser_prefs.h"
-#include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_browser_process_test.h"
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 5f27c6f..0462912 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -53,7 +53,7 @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc
index d33c958..c197231 100644
--- a/chrome/browser/history/top_sites_unittest.cc
+++ b/chrome/browser/history/top_sites_unittest.cc
@@ -19,7 +19,7 @@
 #include "chrome/browser/history/top_sites_backend.h"
 #include "chrome/browser/history/top_sites_cache.h"
 #include "chrome/browser/history/top_sites_database.h"
-#include "chrome/browser/ui/webui/ntp/most_visited_handler.h"
+#include "chrome/browser/ui/webui/most_visited_handler.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 02d9c93..1c5989e 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -71,7 +71,7 @@
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/extension_icon_source.h"
-#include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
+#include "chrome/browser/ui/webui/ntp_resource_cache.h"
 #include "chrome/browser/user_style_sheet_watcher.h"
 #include "chrome/browser/visitedlink/visitedlink_event_listener.h"
 #include "chrome/browser/visitedlink/visitedlink_master.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 863a7ec..70d1ac5 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/safe_browsing/malware_details.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index 4876c81..4c99a06 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -23,7 +23,7 @@
 #include "chrome/browser/tabs/tab_strip_model_order_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_profile.h"
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/app_launcher_handler.cc
index 3dc1575..95621d5 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/app_launcher_handler.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/ui/webui/ntp/app_launcher_handler.h"
+#include "chrome/browser/ui/webui/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
@@ -22,7 +22,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/extension_icon_source.h"
-#include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/app_launcher_handler.h
index 1373f7e..3b07cc9 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h
+++ b/chrome/browser/ui/webui/app_launcher_handler.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_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_APP_LAUNCHER_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_APP_LAUNCHER_HANDLER_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
@@ -153,4 +153,4 @@ class AppLauncherHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(AppLauncherHandler);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_NTP_APP_LAUNCHER_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_APP_LAUNCHER_HANDLER_H_
diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
index d86207d..c0d9805 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/ui/webui/history_ui.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "chrome/browser/ui/webui/net_internals_ui.h"
-#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/ui/webui/plugins_ui.h"
 #include "chrome/browser/ui/webui/print_preview_ui.h"
diff --git a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc b/chrome/browser/ui/webui/foreign_session_handler.cc
index 33d6801..fa37be1 100644
--- a/chrome/browser/ui/webui/ntp/foreign_session_handler.cc
+++ b/chrome/browser/ui/webui/foreign_session_handler.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/ui/webui/ntp/foreign_session_handler.h"
+#include "chrome/browser/ui/webui/foreign_session_handler.h"
 
 #include <algorithm>
 #include <string>
@@ -15,7 +15,7 @@
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_service.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/webui/ntp/foreign_session_handler.h b/chrome/browser/ui/webui/foreign_session_handler.h
index 7bff99a..8cc14e7 100644
--- a/chrome/browser/ui/webui/ntp/foreign_session_handler.h
+++ b/chrome/browser/ui/webui/foreign_session_handler.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_UI_WEBUI_NTP_FOREIGN_SESSION_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_NTP_FOREIGN_SESSION_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_FOREIGN_SESSION_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_FOREIGN_SESSION_HANDLER_H_
 #pragma once
 
 #include <vector>
@@ -60,4 +60,4 @@ class ForeignSessionHandler : public WebUIMessageHandler,
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_UI_WEBUI_NTP_FOREIGN_SESSION_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_FOREIGN_SESSION_HANDLER_H_
diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/most_visited_handler.cc
index 8cc405d..0d57872 100644
--- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc
+++ b/chrome/browser/ui/webui/most_visited_handler.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/ui/webui/ntp/most_visited_handler.h"
+#include "chrome/browser/ui/webui/most_visited_handler.h"
 
 #include <set>
 
@@ -24,8 +24,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
-#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
-#include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
+#include "chrome/browser/ui/webui/thumbnail_source.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.h b/chrome/browser/ui/webui/most_visited_handler.h
index d2ca8ea..d9e1fc4 100644
--- a/chrome/browser/ui/webui/ntp/most_visited_handler.h
+++ b/chrome/browser/ui/webui/most_visited_handler.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_UI_WEBUI_NTP_MOST_VISITED_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_NTP_MOST_VISITED_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_MOST_VISITED_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_MOST_VISITED_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -130,4 +130,4 @@ class MostVisitedHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(MostVisitedHandler);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_NTP_MOST_VISITED_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_MOST_VISITED_HANDLER_H_
diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc b/chrome/browser/ui/webui/new_tab_page_sync_handler.cc
index 7b9320a..dd12161 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
+++ b/chrome/browser/ui/webui/new_tab_page_sync_handler.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/ui/webui/ntp/new_tab_page_sync_handler.h"
+#include "chrome/browser/ui/webui/new_tab_page_sync_handler.h"
 
 #include <vector>
 
diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h b/chrome/browser/ui/webui/new_tab_page_sync_handler.h
index 90198bb..e7c219d 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h
+++ b/chrome/browser/ui/webui/new_tab_page_sync_handler.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_UI_WEBUI_NTP_NEW_TAB_PAGE_SYNC_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_PAGE_SYNC_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_NEW_TAB_PAGE_SYNC_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_NEW_TAB_PAGE_SYNC_HANDLER_H_
 #pragma once
 
 #include <string>
@@ -66,4 +66,4 @@ class NewTabPageSyncHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(NewTabPageSyncHandler);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_PAGE_SYNC_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_NEW_TAB_PAGE_SYNC_HANDLER_H_
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/new_tab_ui.cc
index 79be2db..69957fc 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc
+++ b/chrome/browser/ui/webui/new_tab_ui.cc
@@ -4,7 +4,7 @@
 
 #include "build/build_config.h"
 
-#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
 
 #include <set>
 
@@ -27,15 +27,15 @@
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
-#include "chrome/browser/ui/webui/ntp/foreign_session_handler.h"
-#include "chrome/browser/ui/webui/ntp/most_visited_handler.h"
-#include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h"
-#include "chrome/browser/ui/webui/ntp/ntp_login_handler.h"
-#include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
-#include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
-#include "chrome/browser/ui/webui/ntp/value_helper.h"
+#include "chrome/browser/ui/webui/app_launcher_handler.h"
+#include "chrome/browser/ui/webui/foreign_session_handler.h"
+#include "chrome/browser/ui/webui/most_visited_handler.h"
+#include "chrome/browser/ui/webui/new_tab_page_sync_handler.h"
+#include "chrome/browser/ui/webui/ntp_login_handler.h"
+#include "chrome/browser/ui/webui/ntp_resource_cache.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
+#include "chrome/browser/ui/webui/value_helper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/new_tab_ui.h
index 8fbcfd2..2f1954e 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.h
+++ b/chrome/browser/ui/webui/new_tab_ui.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_UI_WEBUI_NTP_NEW_TAB_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_NEW_TAB_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_NEW_TAB_UI_H_
 #pragma once
 
 #include <string>
@@ -117,4 +117,4 @@ class NewTabUI : public WebUI,
   DISALLOW_COPY_AND_ASSIGN(NewTabUI);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_NTP_NEW_TAB_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_NEW_TAB_UI_H_
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_uitest.cc b/chrome/browser/ui/webui/new_tab_ui_uitest.cc
index 970e62e..3164fb6 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui_uitest.cc
+++ b/chrome/browser/ui/webui/new_tab_ui_uitest.cc
@@ -8,7 +8,7 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/sync/signin_manager.h"
-#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp_login_handler.cc
index d545b27..b107630 100644
--- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
+++ b/chrome/browser/ui/webui/ntp_login_handler.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/ui/webui/ntp/ntp_login_handler.h"
+#include "chrome/browser/ui/webui/ntp_login_handler.h"
 
 #include <string>
 
diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.h b/chrome/browser/ui/webui/ntp_login_handler.h
index 6245deb..387df42 100644
--- a/chrome/browser/ui/webui/ntp/ntp_login_handler.h
+++ b/chrome/browser/ui/webui/ntp_login_handler.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_UI_WEBUI_NTP_NTP_LOGIN_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_NTP_NTP_LOGIN_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_NTP_LOGIN_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_NTP_LOGIN_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_member.h"
@@ -39,4 +39,4 @@ class NTPLoginHandler : public WebUIMessageHandler,
   StringPrefMember username_pref_;
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_NTP_NTP_LOGIN_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_NTP_LOGIN_HANDLER_H_
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp_resource_cache.cc
index 79dad7e..b3910ed 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp_resource_cache.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/ui/webui/ntp/ntp_resource_cache.h"
+#include "chrome/browser/ui/webui/ntp_resource_cache.h"
 
 #include <algorithm>
 #include <vector>
@@ -22,7 +22,7 @@
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h b/chrome/browser/ui/webui/ntp_resource_cache.h
index 1029b43..02ea7c53 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h
+++ b/chrome/browser/ui/webui/ntp_resource_cache.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_UI_WEBUI_NTP_NTP_RESOURCE_CACHE_H_
-#define CHROME_BROWSER_UI_WEBUI_NTP_NTP_RESOURCE_CACHE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_NTP_RESOURCE_CACHE_H_
+#define CHROME_BROWSER_UI_WEBUI_NTP_RESOURCE_CACHE_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -49,4 +49,4 @@ class NTPResourceCache : public NotificationObserver {
   DISALLOW_COPY_AND_ASSIGN(NTPResourceCache);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_NTP_NTP_RESOURCE_CACHE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_NTP_RESOURCE_CACHE_H_
diff --git a/chrome/browser/ui/webui/ntp/shown_sections_handler.cc b/chrome/browser/ui/webui/shown_sections_handler.cc
index dac5199..c8811c3 100644
--- a/chrome/browser/ui/webui/ntp/shown_sections_handler.cc
+++ b/chrome/browser/ui/webui/shown_sections_handler.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/ui/webui/ntp/shown_sections_handler.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 
 #include <string>
 
diff --git a/chrome/browser/ui/webui/ntp/shown_sections_handler.h b/chrome/browser/ui/webui/shown_sections_handler.h
index 1fae2e4..98264d5 100644
--- a/chrome/browser/ui/webui/ntp/shown_sections_handler.h
+++ b/chrome/browser/ui/webui/shown_sections_handler.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_UI_WEBUI_NTP_SHOWN_SECTIONS_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_NTP_SHOWN_SECTIONS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SHOWN_SECTIONS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_SHOWN_SECTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_change_registrar.h"
@@ -76,4 +76,4 @@ class ShownSectionsHandler : public WebUIMessageHandler,
   DISALLOW_COPY_AND_ASSIGN(ShownSectionsHandler);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_NTP_SHOWN_SECTIONS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_SHOWN_SECTIONS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/ntp/shown_sections_handler_unittest.cc b/chrome/browser/ui/webui/shown_sections_handler_unittest.cc
index ec96cb0..c24c385 100644
--- a/chrome/browser/ui/webui/ntp/shown_sections_handler_unittest.cc
+++ b/chrome/browser/ui/webui/shown_sections_handler_unittest.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/ui/webui/ntp/shown_sections_handler.h"
+#include "chrome/browser/ui/webui/shown_sections_handler.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/prefs/pref_value_store.h"
diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc
index 75cb895..010b3a1 100644
--- a/chrome/browser/ui/webui/theme_source.cc
+++ b/chrome/browser/ui/webui/theme_source.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/resources_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
+#include "chrome/browser/ui/webui/ntp_resource_cache.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/ui/webui/ntp/thumbnail_source.cc b/chrome/browser/ui/webui/thumbnail_source.cc
index 6b9c7ef..8b98a9f 100644
--- a/chrome/browser/ui/webui/ntp/thumbnail_source.cc
+++ b/chrome/browser/ui/webui/thumbnail_source.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/ui/webui/ntp/thumbnail_source.h"
+#include "chrome/browser/ui/webui/thumbnail_source.h"
 
 #include "base/callback.h"
 #include "chrome/browser/history/top_sites.h"
diff --git a/chrome/browser/ui/webui/ntp/thumbnail_source.h b/chrome/browser/ui/webui/thumbnail_source.h
index 6da959a..d9d1119 100644
--- a/chrome/browser/ui/webui/ntp/thumbnail_source.h
+++ b/chrome/browser/ui/webui/thumbnail_source.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_UI_WEBUI_NTP_THUMBNAIL_SOURCE_H_
-#define CHROME_BROWSER_UI_WEBUI_NTP_THUMBNAIL_SOURCE_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_THUMBNAIL_SOURCE_H_
+#define CHROME_BROWSER_UI_WEBUI_THUMBNAIL_SOURCE_H_
 #pragma once
 
 #include <string>
@@ -51,4 +51,4 @@ class ThumbnailSource : public ChromeURLDataManager::DataSource {
   DISALLOW_COPY_AND_ASSIGN(ThumbnailSource);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_NTP_THUMBNAIL_SOURCE_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_THUMBNAIL_SOURCE_H_
diff --git a/chrome/browser/ui/webui/ntp/value_helper.cc b/chrome/browser/ui/webui/value_helper.cc
index 426cdcd..bb622f4 100644
--- a/chrome/browser/ui/webui/ntp/value_helper.cc
+++ b/chrome/browser/ui/webui/value_helper.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/ntp/value_helper.h"
+#include "chrome/browser/ui/webui/value_helper.h"
 
-#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
+#include "chrome/browser/ui/webui/new_tab_ui.h"
 #include "chrome/common/url_constants.h"
 
 bool ValueHelper::TabToValue(
diff --git a/chrome/browser/ui/webui/ntp/value_helper.h b/chrome/browser/ui/webui/value_helper.h
index bf5ba4a..ea445fc 100644
--- a/chrome/browser/ui/webui/ntp/value_helper.h
+++ b/chrome/browser/ui/webui/value_helper.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_UI_WEBUI_NTP_VALUE_HELPER_H_
-#define CHROME_BROWSER_UI_WEBUI_NTP_VALUE_HELPER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_VALUE_HELPER_H_
+#define CHROME_BROWSER_UI_WEBUI_VALUE_HELPER_H_
 #pragma once
 
 #include "chrome/browser/sessions/tab_restore_service.h"
@@ -21,5 +21,5 @@ class ValueHelper {
   DISALLOW_IMPLICIT_CONSTRUCTORS(ValueHelper);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_NTP_VALUE_HELPER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_VALUE_HELPER_H_
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 2a5447f..4dbcddf 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3168,6 +3168,8 @@
         'browser/ui/views/wrench_menu.h',
         'browser/ui/web_applications/web_app_ui.cc',
         'browser/ui/web_applications/web_app_ui.h',
+        'browser/ui/webui/app_launcher_handler.cc',
+        'browser/ui/webui/app_launcher_handler.h',
         'browser/ui/webui/bookmarks_ui.cc',
         'browser/ui/webui/bookmarks_ui.h',
         'browser/ui/webui/bug_report_ui.cc',
@@ -3226,6 +3228,8 @@
         'browser/ui/webui/fileicon_source.h',
         'browser/ui/webui/flags_ui.cc',
         'browser/ui/webui/flags_ui.h',
+        'browser/ui/webui/foreign_session_handler.cc',
+        'browser/ui/webui/foreign_session_handler.h',
         'browser/ui/webui/gpu_internals_ui.cc',
         'browser/ui/webui/gpu_internals_ui.h',
         'browser/ui/webui/history2_ui.cc',
@@ -3240,28 +3244,18 @@
         'browser/ui/webui/keyboard_ui.h',
         'browser/ui/webui/mediaplayer_ui.cc',
         'browser/ui/webui/mediaplayer_ui.h',
+        'browser/ui/webui/most_visited_handler.cc',
+        'browser/ui/webui/most_visited_handler.h',
         'browser/ui/webui/net_internals_ui.cc',
         'browser/ui/webui/net_internals_ui.h',
-        'browser/ui/webui/ntp/app_launcher_handler.cc',
-        'browser/ui/webui/ntp/app_launcher_handler.h',
-        'browser/ui/webui/ntp/foreign_session_handler.cc',
-        'browser/ui/webui/ntp/foreign_session_handler.h',
-        'browser/ui/webui/ntp/most_visited_handler.cc',
-        'browser/ui/webui/ntp/most_visited_handler.h',
-        'browser/ui/webui/ntp/new_tab_page_sync_handler.cc',
-        'browser/ui/webui/ntp/new_tab_page_sync_handler.h',
-        'browser/ui/webui/ntp/new_tab_ui.cc',
-        'browser/ui/webui/ntp/new_tab_ui.h',
-        'browser/ui/webui/ntp/ntp_login_handler.cc',
-        'browser/ui/webui/ntp/ntp_login_handler.h',
-        'browser/ui/webui/ntp/ntp_resource_cache.cc',
-        'browser/ui/webui/ntp/ntp_resource_cache.h',
-        'browser/ui/webui/ntp/shown_sections_handler.cc',
-        'browser/ui/webui/ntp/shown_sections_handler.h',
-        'browser/ui/webui/ntp/thumbnail_source.cc',
-        'browser/ui/webui/ntp/thumbnail_source.h',
-        'browser/ui/webui/ntp/value_helper.cc',
-        'browser/ui/webui/ntp/value_helper.h',
+        'browser/ui/webui/new_tab_page_sync_handler.cc',
+        'browser/ui/webui/new_tab_page_sync_handler.h',
+        'browser/ui/webui/new_tab_ui.cc',
+        'browser/ui/webui/new_tab_ui.h',
+        'browser/ui/webui/ntp_login_handler.cc',
+        'browser/ui/webui/ntp_login_handler.h',
+        'browser/ui/webui/ntp_resource_cache.cc',
+        'browser/ui/webui/ntp_resource_cache.h',
         'browser/ui/webui/options/about_page_handler.cc',
         'browser/ui/webui/options/about_page_handler.h',
         'browser/ui/webui/options/advanced_options_handler.cc',
@@ -3360,6 +3354,8 @@
         'browser/ui/webui/screenshot_source.h',
         'browser/ui/webui/shared_resources_data_source.cc',
         'browser/ui/webui/shared_resources_data_source.h',
+        'browser/ui/webui/shown_sections_handler.cc',
+        'browser/ui/webui/shown_sections_handler.h',
         'browser/ui/webui/sync_internals_html_source.cc',
         'browser/ui/webui/sync_internals_html_source.h',
         'browser/ui/webui/sync_internals_ui.cc',
@@ -3368,6 +3364,10 @@
         'browser/ui/webui/textfields_ui.h',
         'browser/ui/webui/theme_source.cc',
         'browser/ui/webui/theme_source.h',
+        'browser/ui/webui/thumbnail_source.cc',
+        'browser/ui/webui/thumbnail_source.h',
+        'browser/ui/webui/value_helper.cc',
+        'browser/ui/webui/value_helper.h',
         'browser/ui/webui/web_ui_util.cc',
         'browser/ui/webui/web_ui_util.h',
         'browser/ui/window_sizer.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 36aed8c..31a7164 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -629,7 +629,7 @@
         'browser/ui/tests/browser_uitest.cc',
         'browser/ui/views/find_bar_host_uitest.cc',
         'browser/ui/webui/bookmarks_ui_uitest.cc',
-        'browser/ui/webui/ntp/new_tab_ui_uitest.cc',
+        'browser/ui/webui/new_tab_ui_uitest.cc',
         'browser/ui/webui/options/options_ui_uitest.cc',
         'browser/ui/webui/print_preview_ui_uitest.cc',
         'common/logging_chrome_uitest.cc',
@@ -1774,9 +1774,9 @@
         'browser/ui/views/shell_dialogs_win_unittest.cc',
         'browser/ui/views/status_icons/status_tray_win_unittest.cc',
         'browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc',
-        'browser/ui/webui/ntp/shown_sections_handler_unittest.cc',
         'browser/ui/webui/options/language_options_handler_unittest.cc',
         'browser/ui/webui/print_preview_ui_html_source_unittest.cc',
+        'browser/ui/webui/shown_sections_handler_unittest.cc',
         'browser/ui/webui/sync_internals_ui_unittest.cc',
         'browser/ui/webui/theme_source_unittest.cc',
         'browser/ui/webui/chromeos/enterprise_enrollment_ui_unittest.cc',
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 609f577..83b9bae 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -39,7 +39,7 @@
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
+#include "chrome/browser/ui/webui/ntp_resource_cache.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/test_url_request_context_getter.h"
diff --git a/content/browser/webui/web_ui_unittest.cc b/content/browser/webui/web_ui_unittest.cc
index 8c77777..b81f3a8 100644
--- a/content/browser/webui/web_ui_unittest.cc
+++ b/content/browser/webui/web_ui_unittest.cc
@@ -2,6 +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/ui/webui/new_tab_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"