[Android] Upstream remaining changes to NTP UI code.

chrome/browser/ui/webui/ntp/ntp_resource_cache_android.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/ui/webui/ntp/ntp_resource_cache.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ skipping 64 matching lines @@
         l10n_util::GetStringUTF16(IDS_BOOKMARK_REMOVE_FOLDER));
   localized_strings.SetString("receivedDocuments",
       l10n_util::GetStringUTF16(IDS_RECEIVED_DOCUMENTS));
   localized_strings.SetString("syncPromo",
       l10n_util::GetStringUTF16(IDS_SYNC_PROMO_DESKTOP_INSTRUCTIONS));
   localized_strings.SetString("syncEnableSync",
       l10n_util::GetStringUTF16(IDS_SYNC_ENABLE_SYNC));
   localized_strings.SetString("bookmarkstitle",
       l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS));
 
-  NewTabPageHandler::GetLocalizedValues(profile_, &localized_strings);
-
   ChromeURLDataManager::DataSource::SetFontAndTextDirection(&localized_strings);
 
   base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance().
       GetRawDataResource(IDR_NEW_TAB_ANDROID_HTML,
                          ui::SCALE_FACTOR_NONE));
   localized_strings.SetString(
       "device",
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kTabletUI) ?
           "tablet" : "phone");
   const char* new_tab_link = kLearnMoreIncognitoUrl;
@@ skipping 20 matching lines @@
     size_t after_offset = pos + template_data_placeholder.size();
     full_html.append(new_tab_html.data() + after_offset,
                      new_tab_html.size() - after_offset);
   } else {
     NOTREACHED();
     full_html.assign(new_tab_html.data(), new_tab_html.size());
   }
 
   new_tab_html_ = base::RefCountedString::TakeString(&full_html);
 }