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

Side by Side Diff: chrome/browser/geolocation/geolocation_permission_context_unittest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/geolocation/geolocation_permission_context.h" 5 #include "chrome/browser/geolocation/geolocation_permission_context.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 30 matching lines...) Expand all
41 #include "content/public/browser/notification_service.h" 41 #include "content/public/browser/notification_service.h"
42 #include "content/public/browser/render_frame_host.h" 42 #include "content/public/browser/render_frame_host.h"
43 #include "content/public/browser/web_contents.h" 43 #include "content/public/browser/web_contents.h"
44 #include "content/public/test/mock_render_process_host.h" 44 #include "content/public/test/mock_render_process_host.h"
45 #include "content/public/test/test_renderer_host.h" 45 #include "content/public/test/test_renderer_host.h"
46 #include "content/public/test/test_utils.h" 46 #include "content/public/test/test_utils.h"
47 #include "content/public/test/web_contents_tester.h" 47 #include "content/public/test/web_contents_tester.h"
48 #include "testing/gtest/include/gtest/gtest.h" 48 #include "testing/gtest/include/gtest/gtest.h"
49 49
50 #if BUILDFLAG(ANDROID_JAVA_UI) 50 #if BUILDFLAG(ANDROID_JAVA_UI)
51 #include "base/prefs/pref_service.h"
52 #include "chrome/browser/android/mock_location_settings.h" 51 #include "chrome/browser/android/mock_location_settings.h"
53 #include "chrome/browser/geolocation/geolocation_permission_context_android.h" 52 #include "chrome/browser/geolocation/geolocation_permission_context_android.h"
53 #include "components/prefs/pref_service.h"
54 #else 54 #else
55 #include "chrome/browser/ui/website_settings/mock_permission_bubble_view.h" 55 #include "chrome/browser/ui/website_settings/mock_permission_bubble_view.h"
56 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" 56 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
57 #endif 57 #endif
58 58
59 #if defined(ENABLE_EXTENSIONS) 59 #if defined(ENABLE_EXTENSIONS)
60 #include "extensions/browser/view_type_utils.h" 60 #include "extensions/browser/view_type_utils.h"
61 #endif 61 #endif
62 62
63 using content::MockRenderProcessHost; 63 using content::MockRenderProcessHost;
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 // it is the embedder. 977 // it is the embedder.
978 EXPECT_EQ(map->GetLastUsage(requesting_frame_0.GetOrigin(), 978 EXPECT_EQ(map->GetLastUsage(requesting_frame_0.GetOrigin(),
979 requesting_frame_0.GetOrigin(), 979 requesting_frame_0.GetOrigin(),
980 CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(), 980 CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(),
981 13); 981 13);
982 EXPECT_EQ(map->GetLastUsage(requesting_frame_1.GetOrigin(), 982 EXPECT_EQ(map->GetLastUsage(requesting_frame_1.GetOrigin(),
983 requesting_frame_0.GetOrigin(), 983 requesting_frame_0.GetOrigin(),
984 CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(), 984 CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(),
985 11); 985 11);
986 } 986 }
OLDNEW
« no previous file with comments | « chrome/browser/geolocation/geolocation_permission_context_factory.h ('k') | chrome/browser/google/google_brand_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698