NTP: Remove command line flag that allowed a local file to be used for the ne...

chrome/browser/dom_ui/ntp_resource_cache.cc

 // Copyright (c) 2009 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/dom_ui/ntp_resource_cache.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/animation.h"
@@ skipping 46 matching lines @@
     "http://www.google.com/support/chrome/bin/answer.py?answer=165139";
 
 // The URL to be loaded to display Help.
 const char* const kHelpContentUrl =
     "http://www.google.com/support/chrome/";
 
 std::wstring GetUrlWithLang(const char* const url) {
   return ASCIIToWide(google_util::AppendGoogleLocaleParam(GURL(url)).spec());
 }
 
-// In case a file path to the new tab page was provided this tries to load
-// the file and returns the file content if successful. This returns an
-// empty string in case of failure.
-std::string GetCustomNewTabPageFromCommandLine() {
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  const FilePath file_path = command_line->GetSwitchValuePath(
-      switches::kNewTabPage);
-
-  if (!file_path.empty()) {
-    // Read the file contents in, blocking the UI thread of the browser.
-    // This is for testing purposes only! It is used to test new versions of
-    // the new tab page using a special command line option. Never use this
-    // in a way that will be used by default in product.
-    std::string file_contents;
-    if (file_util::ReadFileToString(FilePath(file_path), &file_contents))
-      return file_contents;
-  }
-
-  return std::string();
-}
-
 std::string SkColorToRGBAString(SkColor color) {
   // We convert the alpha using DoubleToString because StringPrintf will use
   // locale specific formatters (e.g., use , instead of . in German).
   return StringPrintf("rgba(%d,%d,%d,%s)", SkColorGetR(color),
       SkColorGetG(color), SkColorGetB(color),
       DoubleToString(SkColorGetA(color) / 255.0).c_str());
 }
 
 // Get the CSS string for the background position on the new tab page for the
 // states when the bar is attached or detached.
@@ skipping 222 matching lines @@
   bool has_3d =
       command_line->HasSwitch(switches::kEnableAcceleratedCompositing);
   localized_strings.SetString(L"has_3d", has_3d ? "true" : "false");
 
   // Pass the shown_sections pref early so that we can prevent flicker.
   ShownSectionsHandler::SetFirstAppLauncherRunPref(profile_->GetPrefs());
   const int shown_sections = profile_->GetPrefs()->GetInteger(
       prefs::kNTPShownSections);
   localized_strings.SetInteger(L"shown_sections", shown_sections);
 
-  // In case we have the new new tab page enabled we first try to read the file
-  // provided on the command line. If that fails we just get the resource from
-  // the resource bundle.
-  base::StringPiece new_tab_html;
-  std::string new_tab_html_str;
-  new_tab_html_str = GetCustomNewTabPageFromCommandLine();
-
-  if (!new_tab_html_str.empty()) {
-    new_tab_html = base::StringPiece(new_tab_html_str);
-  }
-
-  if (new_tab_html.empty()) {
-    new_tab_html = ResourceBundle::GetSharedInstance().GetRawDataResource(
-        IDR_NEW_NEW_TAB_HTML);
-  }
+  base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance().
+      GetRawDataResource(IDR_NEW_NEW_TAB_HTML));
 
   // Inject the template data into the HTML so that it is available before any
   // layout is needed.
   std::string json_html;
   jstemplate_builder::AppendJsonHtml(&localized_strings, &json_html);
 
   static const base::StringPiece template_data_placeholder(
       "<!-- template data placeholder -->");
   size_t pos = new_tab_html.find(template_data_placeholder);
 
@@ skipping 126 matching lines @@
   // Create the string from our template and the replacements.
   const std::string css_string = ReplaceStringPlaceholders(
       new_tab_theme_css, subst, NULL);
   std::string full_css = ReplaceStringPlaceholders(css_string, subst2, NULL);
 
   new_tab_css_ = new RefCountedBytes;
   new_tab_css_->data.resize(full_css.size());
   std::copy(full_css.begin(), full_css.end(),
             new_tab_css_->data.begin());
 }