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

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

Issue 769593003: Move ZoomObserver, ZoomController and ZoomEventManager to components/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete defines in build files. Created 6 years 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 <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/files/file_util.h" 13 #include "base/files/file_util.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/prefs/pref_service.h" 17 #include "base/prefs/pref_service.h"
18 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "chrome/browser/chrome_page_zoom.h" 20 #include "chrome/browser/chrome_page_zoom.h"
21 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/profiles/profile_impl.h" 22 #include "chrome/browser/profiles/profile_impl.h"
23 #include "chrome/browser/ui/browser.h" 23 #include "chrome/browser/ui/browser.h"
24 #include "chrome/browser/ui/tabs/tab_strip_model.h" 24 #include "chrome/browser/ui/tabs/tab_strip_model.h"
25 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h" 25 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
26 #include "chrome/browser/ui/zoom/zoom_event_manager.h"
27 #include "chrome/common/chrome_constants.h" 26 #include "chrome/common/chrome_constants.h"
28 #include "chrome/common/chrome_paths.h" 27 #include "chrome/common/chrome_paths.h"
29 #include "chrome/common/pref_names.h" 28 #include "chrome/common/pref_names.h"
30 #include "chrome/common/url_constants.h" 29 #include "chrome/common/url_constants.h"
31 #include "chrome/test/base/in_process_browser_test.h" 30 #include "chrome/test/base/in_process_browser_test.h"
32 #include "chrome/test/base/testing_profile.h" 31 #include "chrome/test/base/testing_profile.h"
33 #include "chrome/test/base/ui_test_utils.h" 32 #include "chrome/test/base/ui_test_utils.h"
33 #include "components/ui/zoom/zoom_event_manager.h"
34 #include "content/public/test/test_utils.h" 34 #include "content/public/test/test_utils.h"
35 #include "net/dns/mock_host_resolver.h" 35 #include "net/dns/mock_host_resolver.h"
36 #include "net/test/embedded_test_server/embedded_test_server.h" 36 #include "net/test/embedded_test_server/embedded_test_server.h"
37 #include "net/test/embedded_test_server/http_response.h" 37 #include "net/test/embedded_test_server/http_response.h"
38 #include "testing/gmock/include/gmock/gmock.h" 38 #include "testing/gmock/include/gmock/gmock.h"
39 #include "url/gurl.h" 39 #include "url/gurl.h"
40 40
41 using content::HostZoomMap; 41 using content::HostZoomMap;
42 42
43 namespace { 43 namespace {
44 44
45 class ZoomLevelChangeObserver { 45 class ZoomLevelChangeObserver {
46 public: 46 public:
47 explicit ZoomLevelChangeObserver(content::BrowserContext* context) 47 explicit ZoomLevelChangeObserver(content::BrowserContext* context)
48 : message_loop_runner_(new content::MessageLoopRunner) { 48 : message_loop_runner_(new content::MessageLoopRunner) {
49 subscription_ = ZoomEventManager::GetForBrowserContext(context) 49 subscription_ = ui_zoom::ZoomEventManager::GetForBrowserContext(context)
50 ->AddZoomLevelChangedCallback(base::Bind( 50 ->AddZoomLevelChangedCallback(base::Bind(
51 &ZoomLevelChangeObserver::OnZoomLevelChanged, 51 &ZoomLevelChangeObserver::OnZoomLevelChanged,
52 base::Unretained(this))); 52 base::Unretained(this)));
53 } 53 }
54 54
55 void BlockUntilZoomLevelForHostHasChanged(const std::string& host) { 55 void BlockUntilZoomLevelForHostHasChanged(const std::string& host) {
56 while (!std::count(changed_hosts_.begin(), changed_hosts_.end(), host)) { 56 while (!std::count(changed_hosts_.begin(), changed_hosts_.end(), host)) {
57 message_loop_runner_->Run(); 57 message_loop_runner_->Run();
58 message_loop_runner_ = new content::MessageLoopRunner; 58 message_loop_runner_ = new content::MessageLoopRunner;
59 } 59 }
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 parent_zoom_map->SetZoomLevelForHost(host, zoom_level_40); 452 parent_zoom_map->SetZoomLevelForHost(host, zoom_level_40);
453 ASSERT_EQ( 453 ASSERT_EQ(
454 parent_zoom_map->GetZoomLevelForHostAndScheme("http", host), 454 parent_zoom_map->GetZoomLevelForHostAndScheme("http", host),
455 zoom_level_40); 455 zoom_level_40);
456 456
457 EXPECT_EQ(parent_zoom_map->GetZoomLevelForHostAndScheme("http", host), 457 EXPECT_EQ(parent_zoom_map->GetZoomLevelForHostAndScheme("http", host),
458 child_zoom_map->GetZoomLevelForHostAndScheme("http", host)) << 458 child_zoom_map->GetZoomLevelForHostAndScheme("http", host)) <<
459 "Parent change should propagate to child."; 459 "Parent change should propagate to child.";
460 base::RunLoop().RunUntilIdle(); 460 base::RunLoop().RunUntilIdle();
461 } 461 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698