Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Side by Side Diff: chrome/browser/profiles/host_zoom_map_browsertest.cc

Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/browser/host_zoom_map.h" 5 #include "content/public/browser/host_zoom_map.h"
6 6
7 #include <stddef.h>
8
7 #include <algorithm> 9 #include <algorithm>
8 #include <string> 10 #include <string>
9 #include <vector> 11 #include <vector>
10 12
11 #include "base/bind.h" 13 #include "base/bind.h"
12 #include "base/command_line.h" 14 #include "base/command_line.h"
13 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
14 #include "base/files/file_util.h" 16 #include "base/files/file_util.h"
17 #include "base/macros.h"
15 #include "base/memory/ref_counted.h" 18 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h" 19 #include "base/memory/scoped_ptr.h"
17 #include "base/path_service.h" 20 #include "base/path_service.h"
18 #include "base/prefs/pref_service.h" 21 #include "base/prefs/pref_service.h"
19 #include "base/strings/stringprintf.h" 22 #include "base/strings/stringprintf.h"
20 #include "base/values.h" 23 #include "base/values.h"
21 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/profiles/profile_impl.h" 25 #include "chrome/browser/profiles/profile_impl.h"
23 #include "chrome/browser/signin/signin_promo.h" 26 #include "chrome/browser/signin/signin_promo.h"
24 #include "chrome/browser/ui/browser.h" 27 #include "chrome/browser/ui/browser.h"
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 ZoomLevelChangeObserver observer(browser()->profile()); 410 ZoomLevelChangeObserver observer(browser()->profile());
408 411
409 web_contents->SetPageScale(1.5); 412 web_contents->SetPageScale(1.5);
410 observer.BlockUntilZoomLevelForHostHasChanged(test_host); 413 observer.BlockUntilZoomLevelForHostHasChanged(test_host);
411 EXPECT_FALSE(content::HostZoomMap::PageScaleFactorIsOne(web_contents)); 414 EXPECT_FALSE(content::HostZoomMap::PageScaleFactorIsOne(web_contents));
412 415
413 web_contents->SetPageScale(1.f); 416 web_contents->SetPageScale(1.f);
414 observer.BlockUntilZoomLevelForHostHasChanged(test_host); 417 observer.BlockUntilZoomLevelForHostHasChanged(test_host);
415 EXPECT_TRUE(content::HostZoomMap::PageScaleFactorIsOne(web_contents)); 418 EXPECT_TRUE(content::HostZoomMap::PageScaleFactorIsOne(web_contents));
416 } 419 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/gaia_info_update_service_unittest.cc ('k') | chrome/browser/profiles/incognito_mode_policy_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698