Add Geolocation to the content types. This adds several special case guards s...

chrome/browser/views/options/content_settings_window_view.cc

 // Copyright (c) 2010 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/views/options/content_settings_window_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/pref_service.h"
@@ skipping 151 matching lines @@
   tabs_->AddTabAtIndex(tab_index++,
                        l10n_util::GetString(IDS_PLUGIN_TAB_LABEL),
                        plugin_page, false);
 
   ContentFilterPageView* popup_page =
       new ContentFilterPageView(profile_, CONTENT_SETTINGS_TYPE_POPUPS);
   tabs_->AddTabAtIndex(tab_index++,
                        l10n_util::GetString(IDS_POPUP_TAB_LABEL),
                        popup_page, false);
 
-  DCHECK_EQ(tabs_->GetTabCount(), CONTENT_SETTINGS_NUM_TYPES);
+  // TODO(joth): remove -1 when geolocation tab is added.
+  DCHECK_EQ(tabs_->GetTabCount(), CONTENT_SETTINGS_NUM_TYPES - 1);
 }
 
 const OptionsPageView*
     ContentSettingsWindowView::GetCurrentContentSettingsTabView() const {
   return static_cast<OptionsPageView*>(tabs_->GetSelectedTab());
 }