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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc

Issue 2598963005: Include-what-you-use for WrapUnique/MakeUnique. (Closed)
Patch Set: restore order of includes in x11_topmost_window_finder_interactive_uitest.cc Created 3 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 "chrome/browser/supervised_user/supervised_user_resource_throttle.h" 5 #include "chrome/browser/supervised_user/supervised_user_resource_throttle.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/memory/ptr_util.h"
11 #include "base/path_service.h" 12 #include "base/path_service.h"
12 #include "base/values.h" 13 #include "base/values.h"
13 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/supervised_user/supervised_user_constants.h" 15 #include "chrome/browser/supervised_user/supervised_user_constants.h"
15 #include "chrome/browser/supervised_user/supervised_user_service.h" 16 #include "chrome/browser/supervised_user/supervised_user_service.h"
16 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 17 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
17 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" 18 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
18 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h" 19 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h"
19 #include "chrome/browser/ui/browser.h" 20 #include "chrome/browser/ui/browser.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" 21 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 // Both iframes (from allowed host iframe1.com as well as from blocked host 130 // Both iframes (from allowed host iframe1.com as well as from blocked host
130 // iframe2.com) should be loaded normally, since we don't filter iframes 131 // iframe2.com) should be loaded normally, since we don't filter iframes
131 // (yet) - see crbug.com/651115. 132 // (yet) - see crbug.com/651115.
132 bool loaded1 = false; 133 bool loaded1 = false;
133 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(tab, "loaded1()", &loaded1)); 134 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(tab, "loaded1()", &loaded1));
134 EXPECT_TRUE(loaded1); 135 EXPECT_TRUE(loaded1);
135 bool loaded2 = false; 136 bool loaded2 = false;
136 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(tab, "loaded2()", &loaded2)); 137 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(tab, "loaded2()", &loaded2));
137 EXPECT_TRUE(loaded2); 138 EXPECT_TRUE(loaded2);
138 } 139 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698