Remove the last prefs code from content. I tried hard to move ShouldShowBookmarkBar out of TabCo...

chrome/browser/ui/webui/ntp/new_tab_ui.cc

 // Copyright (c) 2011 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 "build/build_config.h"
 
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/defaults.h"
 #include "chrome/browser/metrics/metric_event_duration_details.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_delegate.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 282 matching lines @@
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // NewTabUI
 
 NewTabUI::NewTabUI(TabContents* contents)
     : WebUI(contents) {
   // Override some options on the Web UI.
   hide_favicon_ = true;
 
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4))
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4) &&
+      GetProfile()->GetPrefs()->GetBoolean(prefs::kEnableBookmarkBar) &&
+      browser_defaults::bookmarks_enabled) {
     force_bookmark_bar_visible_ = true;
+  }
 
   focus_location_bar_by_default_ = true;
   should_hide_url_ = true;
   overridden_title_ = l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE);
 
   // We count all link clicks as AUTO_BOOKMARK, so that site can be ranked more
   // highly. Note this means we're including clicks on not only most visited
   // thumbnails, but also clicks on recently bookmarked.
   link_transition_type_ = PageTransition::AUTO_BOOKMARK;
 
@@ skipping 293 matching lines @@
   SendResponse(request_id, html_bytes);
 }
 
 std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string&) const {
   return "text/html";
 }
 
 bool NewTabUI::NewTabHTMLSource::ShouldReplaceExistingSource() const {
   return false;
 }