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

Side by Side Diff: chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm

Issue 5367006: Refactor: move HostContentSettingsMap to content_settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again Created 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #import "chrome/browser/cocoa/content_settings_dialog_controller.h" 5 #import "chrome/browser/cocoa/content_settings_dialog_controller.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #import "base/scoped_nsobject.h" 9 #import "base/scoped_nsobject.h"
10 #include "base/ref_counted.h" 10 #include "base/ref_counted.h"
11 #include "chrome/browser/cocoa/browser_test_helper.h" 11 #include "chrome/browser/cocoa/browser_test_helper.h"
12 #include "chrome/browser/cocoa/cocoa_test_helper.h" 12 #include "chrome/browser/cocoa/cocoa_test_helper.h"
13 #include "chrome/browser/content_settings/host_content_settings_map.h"
13 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 14 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
14 #include "chrome/browser/host_content_settings_map.h"
15 #include "chrome/browser/notifications/desktop_notification_service.h" 15 #include "chrome/browser/notifications/desktop_notification_service.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
20 #include "testing/platform_test.h" 20 #include "testing/platform_test.h"
21 21
22 namespace { 22 namespace {
23 23
24 class ContentSettingsDialogControllerTest : public CocoaTest { 24 class ContentSettingsDialogControllerTest : public CocoaTest {
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 EXPECT_EQ(setting, CONTENT_SETTING_ASK); 280 EXPECT_EQ(setting, CONTENT_SETTING_ASK);
281 281
282 [controller_ setNotificationsSettingIndex:kNotificationsDisabledIndex]; 282 [controller_ setNotificationsSettingIndex:kNotificationsDisabledIndex];
283 setting = 283 setting =
284 notificationsService_->GetDefaultContentSetting(); 284 notificationsService_->GetDefaultContentSetting();
285 EXPECT_EQ(setting, CONTENT_SETTING_BLOCK); 285 EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);
286 } 286 }
287 287
288 } // namespace 288 } // namespace
289 289
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698