MD Settings: enhance restarting Chrome + interacting w/ session restore

chrome/browser/custom_home_pages_table_model.cc

Index: chrome/browser/custom_home_pages_table_model.cc
diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc
index 5c1bc7de851da1ce06a252303f52382ff3c4fb60..374dcbd535871242232a6e29539362b0bb941578 100644
--- a/chrome/browser/custom_home_pages_table_model.cc
+++ b/chrome/browser/custom_home_pages_table_model.cc
@@ -21,6 +21,7 @@
 #include "components/history/core/browser/history_service.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/url_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/gfx/codec/png_codec.h"
@@ -38,7 +39,7 @@ bool ShouldAddPage(const GURL& url) {
     return false;
 
   if (url.SchemeIs(content::kChromeUIScheme)) {
-    if (url.host_piece() == chrome::kChromeUISettingsHost ||
+    if (url.host_piece() == content::kChromeUISettingsHost ||
         url.host_piece() == chrome::kChromeUISettingsFrameHost) {
       return false;
     }
@@ -46,7 +47,7 @@ bool ShouldAddPage(const GURL& url) {
     // For a settings page, the path will start with "/settings" not "settings"
     // so find() will return 1, not 0.
     if (url.host_piece() == chrome::kChromeUIUberHost &&
-        url.path_piece().find(chrome::kChromeUISettingsHost) == 1) {
+        url.path_piece().find(content::kChromeUISettingsHost) == 1) {
       return false;
     }
   }