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

Side by Side Diff: chrome/browser/extensions/api/tabs/tabs_test.cc

Issue 2245203002: Clean up defensive TabManager handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 <limits.h> 5 #include <limits.h>
6 #include <stddef.h> 6 #include <stddef.h>
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1310 function.get(), base::StringPrintf("[%u, {\"code\": \"true\"}]", 1310 function.get(), base::StringPrintf("[%u, {\"code\": \"true\"}]",
1311 api::windows::WINDOW_ID_CURRENT), 1311 api::windows::WINDOW_ID_CURRENT),
1312 DevToolsWindowTesting::Get(devtools)->browser()), 1312 DevToolsWindowTesting::Get(devtools)->browser()),
1313 manifest_errors::kCannotAccessPageWithUrl)); 1313 manifest_errors::kCannotAccessPageWithUrl));
1314 1314
1315 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); 1315 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools);
1316 } 1316 }
1317 1317
1318 // TODO(georgesak): change this browsertest to an unittest. 1318 // TODO(georgesak): change this browsertest to an unittest.
1319 IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DiscardedProperty) { 1319 IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DiscardedProperty) {
1320 ASSERT_TRUE(g_browser_process && g_browser_process->GetTabManager());
Devlin 2016/08/16 16:10:50 This seems reasonable to keep, since it helps ensu
Anderson Silva 2016/08/16 17:26:12 Done.
1321 memory::TabManager* tab_manager = g_browser_process->GetTabManager(); 1320 memory::TabManager* tab_manager = g_browser_process->GetTabManager();
1322 1321
1323 // Create two aditional tabs. 1322 // Create two aditional tabs.
1324 content::OpenURLParams params(GURL(url::kAboutBlankURL), content::Referrer(), 1323 content::OpenURLParams params(GURL(url::kAboutBlankURL), content::Referrer(),
1325 NEW_BACKGROUND_TAB, ui::PAGE_TRANSITION_LINK, 1324 NEW_BACKGROUND_TAB, ui::PAGE_TRANSITION_LINK,
1326 false); 1325 false);
1327 content::WebContents* web_contents_a = browser()->OpenURL(params); 1326 content::WebContents* web_contents_a = browser()->OpenURL(params);
1328 content::WebContents* web_contents_b = browser()->OpenURL(params); 1327 content::WebContents* web_contents_b = browser()->OpenURL(params);
1329 1328
1330 // Set up query function with an extension. 1329 // Set up query function with an extension.
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
2114 EXPECT_TRUE( 2113 EXPECT_TRUE(
2115 base::MatchPattern(error, manifest_errors::kCannotAccessChromeUrl)); 2114 base::MatchPattern(error, manifest_errors::kCannotAccessChromeUrl));
2116 2115
2117 // chrome.tabs.setZoomSettings(). 2116 // chrome.tabs.setZoomSettings().
2118 error = RunSetZoomSettingsExpectError(tab_id, "manual", "per-tab"); 2117 error = RunSetZoomSettingsExpectError(tab_id, "manual", "per-tab");
2119 EXPECT_TRUE( 2118 EXPECT_TRUE(
2120 base::MatchPattern(error, manifest_errors::kCannotAccessChromeUrl)); 2119 base::MatchPattern(error, manifest_errors::kCannotAccessChromeUrl));
2121 } 2120 }
2122 2121
2123 } // namespace extensions 2122 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/memory/tab_manager.cc » ('j') | chrome/browser/memory/tab_manager_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698