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

Side by Side Diff: content/browser/frame_host/render_frame_host_manager_browsertest.cc

Issue 631013003: Replacing the OVERRIDE with override and FINAL with final in content/browser/frame_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <set> 5 #include <set>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 virtual ~RenderViewHostDestructionObserver() {} 1149 virtual ~RenderViewHostDestructionObserver() {}
1150 void EnsureRVHGetsDestructed(RenderViewHost* rvh) { 1150 void EnsureRVHGetsDestructed(RenderViewHost* rvh) {
1151 watched_render_view_hosts_.insert(rvh); 1151 watched_render_view_hosts_.insert(rvh);
1152 } 1152 }
1153 size_t GetNumberOfWatchedRenderViewHosts() const { 1153 size_t GetNumberOfWatchedRenderViewHosts() const {
1154 return watched_render_view_hosts_.size(); 1154 return watched_render_view_hosts_.size();
1155 } 1155 }
1156 1156
1157 private: 1157 private:
1158 // WebContentsObserver implementation: 1158 // WebContentsObserver implementation:
1159 virtual void RenderViewDeleted(RenderViewHost* rvh) OVERRIDE { 1159 virtual void RenderViewDeleted(RenderViewHost* rvh) override {
1160 watched_render_view_hosts_.erase(rvh); 1160 watched_render_view_hosts_.erase(rvh);
1161 } 1161 }
1162 1162
1163 std::set<RenderViewHost*> watched_render_view_hosts_; 1163 std::set<RenderViewHost*> watched_render_view_hosts_;
1164 }; 1164 };
1165 1165
1166 // Crashes under ThreadSanitizer, http://crbug.com/356758. 1166 // Crashes under ThreadSanitizer, http://crbug.com/356758.
1167 #if defined(THREAD_SANITIZER) 1167 #if defined(THREAD_SANITIZER)
1168 #define MAYBE_LeakingRenderViewHosts DISABLED_LeakingRenderViewHosts 1168 #define MAYBE_LeakingRenderViewHosts DISABLED_LeakingRenderViewHosts
1169 #else 1169 #else
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
1378 GURL webui_url2(webui_url.spec() + "#foo"); 1378 GURL webui_url2(webui_url.spec() + "#foo");
1379 NavigateToURL(shell(), webui_url2); 1379 NavigateToURL(shell(), webui_url2);
1380 EXPECT_EQ(webui, web_contents->GetRenderManagerForTesting()->web_ui()); 1380 EXPECT_EQ(webui, web_contents->GetRenderManagerForTesting()->web_ui());
1381 EXPECT_FALSE(web_contents->GetRenderManagerForTesting()->pending_web_ui()); 1381 EXPECT_FALSE(web_contents->GetRenderManagerForTesting()->pending_web_ui());
1382 } 1382 }
1383 1383
1384 class RFHMProcessPerTabTest : public RenderFrameHostManagerTest { 1384 class RFHMProcessPerTabTest : public RenderFrameHostManagerTest {
1385 public: 1385 public:
1386 RFHMProcessPerTabTest() {} 1386 RFHMProcessPerTabTest() {}
1387 1387
1388 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 1388 virtual void SetUpCommandLine(CommandLine* command_line) override {
1389 command_line->AppendSwitch(switches::kProcessPerTab); 1389 command_line->AppendSwitch(switches::kProcessPerTab);
1390 } 1390 }
1391 }; 1391 };
1392 1392
1393 // Test that we still swap processes for BrowsingInstance changes even in 1393 // Test that we still swap processes for BrowsingInstance changes even in
1394 // --process-per-tab mode. See http://crbug.com/343017. 1394 // --process-per-tab mode. See http://crbug.com/343017.
1395 // Disabled on Android: http://crbug.com/345873. 1395 // Disabled on Android: http://crbug.com/345873.
1396 // Crashes under ThreadSanitizer, http://crbug.com/356758. 1396 // Crashes under ThreadSanitizer, http://crbug.com/356758.
1397 #if defined(OS_ANDROID) || defined(THREAD_SANITIZER) 1397 #if defined(OS_ANDROID) || defined(THREAD_SANITIZER)
1398 #define MAYBE_BackFromWebUI DISABLED_BackFromWebUI 1398 #define MAYBE_BackFromWebUI DISABLED_BackFromWebUI
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
1462 // Navigate to url1 and check bindings. 1462 // Navigate to url1 and check bindings.
1463 NavigateToURL(new_shell, url1); 1463 NavigateToURL(new_shell, url1);
1464 // The navigation should have used the first SiteInstance, otherwise 1464 // The navigation should have used the first SiteInstance, otherwise
1465 // |initial_rvh| did not have a chance to be used. 1465 // |initial_rvh| did not have a chance to be used.
1466 EXPECT_EQ(new_web_contents->GetSiteInstance(), site_instance1); 1466 EXPECT_EQ(new_web_contents->GetSiteInstance(), site_instance1);
1467 EXPECT_EQ(BINDINGS_POLICY_WEB_UI, 1467 EXPECT_EQ(BINDINGS_POLICY_WEB_UI,
1468 new_web_contents->GetRenderViewHost()->GetEnabledBindings()); 1468 new_web_contents->GetRenderViewHost()->GetEnabledBindings());
1469 } 1469 }
1470 1470
1471 } // namespace content 1471 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698