Move the remaining NTP realted files to c/b/android/ntp subdir.

BUG=596080

Review URL: https://codereview.chromium.org/1811333003

Cr-Commit-Position: refs/heads/master@{#382003}

8 files changed, 15 insertions, 15 deletions

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index f322a52..3278139 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -59,7 +59,7 @@
 #include "chrome/browser/android/metrics/variations_session.h"
 #include "chrome/browser/android/most_visited_sites.h"
 #include "chrome/browser/android/net/external_estimate_provider_android.h"
-#include "chrome/browser/android/new_tab_page_prefs.h"
+#include "chrome/browser/android/ntp/new_tab_page_prefs.h"
 #include "chrome/browser/android/ntp/ntp_snippets_bridge.h"
 #include "chrome/browser/android/ntp/ntp_snippets_controller.h"
 #include "chrome/browser/android/ntp/ntp_snippets_launcher.h"
diff --git a/chrome/browser/android/new_tab_page_prefs.cc b/chrome/browser/android/ntp/new_tab_page_prefs.cc
index 7b50d09..dd1f332 100644
--- a/chrome/browser/android/new_tab_page_prefs.cc
+++ b/chrome/browser/android/ntp/new_tab_page_prefs.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/android/new_tab_page_prefs.h"
+#include "chrome/browser/android/ntp/new_tab_page_prefs.h"
 
 #include <jni.h>
 
diff --git a/chrome/browser/android/new_tab_page_prefs.h b/chrome/browser/android/ntp/new_tab_page_prefs.h
index 70bacef..6238e85 100644
--- a/chrome/browser/android/new_tab_page_prefs.h
+++ b/chrome/browser/android/ntp/new_tab_page_prefs.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_ANDROID_NEW_TAB_PAGE_PREFS_H_
-#define CHROME_BROWSER_ANDROID_NEW_TAB_PAGE_PREFS_H_
+#ifndef CHROME_BROWSER_ANDROID_NTP_NEW_TAB_PAGE_PREFS_H_
+#define CHROME_BROWSER_ANDROID_NTP_NEW_TAB_PAGE_PREFS_H_
 
 #include <jni.h>
 
@@ -66,4 +66,4 @@ class NewTabPagePrefs {
   DISALLOW_COPY_AND_ASSIGN(NewTabPagePrefs);
 };
 
-#endif  // CHROME_BROWSER_ANDROID_NEW_TAB_PAGE_PREFS_H_
+#endif  // CHROME_BROWSER_ANDROID_NTP_NEW_TAB_PAGE_PREFS_H_
diff --git a/chrome/browser/android/new_tab_page_url_handler.cc b/chrome/browser/android/ntp/new_tab_page_url_handler.cc
index af73694..6b1d8240 100644
--- a/chrome/browser/android/new_tab_page_url_handler.cc
+++ b/chrome/browser/android/ntp/new_tab_page_url_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/android/new_tab_page_url_handler.h"
+#include "chrome/browser/android/ntp/new_tab_page_url_handler.h"
 
 #include <string>
 
diff --git a/chrome/browser/android/new_tab_page_url_handler.h b/chrome/browser/android/ntp/new_tab_page_url_handler.h
index accea15..d9924cf 100644
--- a/chrome/browser/android/new_tab_page_url_handler.h
+++ b/chrome/browser/android/ntp/new_tab_page_url_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_ANDROID_NEW_TAB_PAGE_URL_HANDLER_H_
-#define CHROME_BROWSER_ANDROID_NEW_TAB_PAGE_URL_HANDLER_H_
+#ifndef CHROME_BROWSER_ANDROID_NTP_NEW_TAB_PAGE_URL_HANDLER_H_
+#define CHROME_BROWSER_ANDROID_NTP_NEW_TAB_PAGE_URL_HANDLER_H_
 
 class GURL;
 
@@ -23,4 +23,4 @@ bool HandleAndroidNativePageURL(GURL* url,
 }  // namespace android
 }  // namespace chrome
 
-#endif  // CHROME_BROWSER_ANDROID_NEW_TAB_PAGE_URL_HANDLER_H_
+#endif  // CHROME_BROWSER_ANDROID_NTP_NEW_TAB_PAGE_URL_HANDLER_H_
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index ad4f5cb..bf3cffe 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -212,7 +212,7 @@
 #endif
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
-#include "chrome/browser/android/new_tab_page_url_handler.h"
+#include "chrome/browser/android/ntp/new_tab_page_url_handler.h"
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
 #include "components/service_tab_launcher/browser/android/service_tab_launcher.h"
 #endif
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 5698bfa..4692ca5 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -140,7 +140,7 @@
 #if BUILDFLAG(ANDROID_JAVA_UI)
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 #include "chrome/browser/android/most_visited_sites.h"
-#include "chrome/browser/android/new_tab_page_prefs.h"
+#include "chrome/browser/android/ntp/new_tab_page_prefs.h"
 #include "chrome/browser/android/popular_sites.h"
 #else
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index b145a99..2795022 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -827,10 +827,10 @@
       'browser/android/most_visited_sites.h',
       'browser/android/net/external_estimate_provider_android.cc',
       'browser/android/net/external_estimate_provider_android.h',
-      'browser/android/new_tab_page_prefs.cc',
-      'browser/android/new_tab_page_prefs.h',
-      'browser/android/new_tab_page_url_handler.cc',
-      'browser/android/new_tab_page_url_handler.h',
+      'browser/android/ntp/new_tab_page_prefs.cc',
+      'browser/android/ntp/new_tab_page_prefs.h',
+      'browser/android/ntp/new_tab_page_url_handler.cc',
+      'browser/android/ntp/new_tab_page_url_handler.h',
       'browser/android/ntp/ntp_snippets_bridge.cc',
       'browser/android/ntp/ntp_snippets_bridge.h',
       'browser/android/ntp/ntp_snippets_controller.cc',