Add scheme to HostZoomMap

chrome/browser/ui/browser_browsertest.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 <string>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
@@ skipping 64 matching lines @@
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/i18n/rtl.h"
 #include "chrome/browser/browser_process.h"
 #endif
 
 using content::InterstitialPage;
+using content::HostZoomMap;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 using content::WebContentsObserver;
 using extensions::Extension;
 
 namespace {
 
@@ skipping 1267 matching lines @@
   IncognitoModePrefs::SetAvailability(popup_browser->profile()->GetPrefs(),
                                       IncognitoModePrefs::ENABLED);
   // OPTIONS and IMPORT_SETTINGS are still disabled since it is a non-normal UI.
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_OPTIONS));
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_IMPORT_SETTINGS));
 }
 
 namespace {
 
 void OnZoomLevelChanged(const base::Closure& callback,
-                        const std::string& host) {
+                        const HostZoomMap::ZoomLevelChange& host) {
   callback.Run();
 }
 
 }  // namespace
 
 #if defined(OS_WIN)
 // Flakes regularly on Windows XP
 // http://crbug.com/146040
 #define MAYBE_PageZoom DISABLED_PageZoom
 #else
@@ skipping 719 matching lines @@
   RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
 }
 
 // Shift-middle-clicks open in a foreground tab.
 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) {
   int modifiers = WebKit::WebInputEvent::ShiftKey;
   WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle;
   WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
   RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
 }