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

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 421193002: Fix ExtensionServiceTest.ClearExtensionData flakiness (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use base::DoNothing for empty callbacks Created 6 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 | Annotate | Revision Log
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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 TabStripModel::ADD_NONE); 1301 TabStripModel::ADD_NONE);
1302 model->SetTabPinned(0, true); 1302 model->SetTabPinned(0, true);
1303 ui_test_utils::NavigateToURL(browser(), url); 1303 ui_test_utils::NavigateToURL(browser(), url);
1304 1304
1305 MockTabStripModelObserver observer; 1305 MockTabStripModelObserver observer;
1306 model->AddObserver(&observer); 1306 model->AddObserver(&observer);
1307 1307
1308 // Uninstall the extension and make sure TabClosing is sent. 1308 // Uninstall the extension and make sure TabClosing is sent.
1309 ExtensionService* service = extensions::ExtensionSystem::Get( 1309 ExtensionService* service = extensions::ExtensionSystem::Get(
1310 browser()->profile())->extension_service(); 1310 browser()->profile())->extension_service();
1311 service->UninstallExtension( 1311 service->UninstallExtension(GetExtension()->id(),
1312 GetExtension()->id(), extensions::UNINSTALL_REASON_FOR_TESTING, NULL); 1312 extensions::UNINSTALL_REASON_FOR_TESTING,
1313 base::Bind(&base::DoNothing),
1314 NULL);
1313 EXPECT_EQ(1, observer.closing_count()); 1315 EXPECT_EQ(1, observer.closing_count());
1314 1316
1315 model->RemoveObserver(&observer); 1317 model->RemoveObserver(&observer);
1316 1318
1317 // There should only be one tab now. 1319 // There should only be one tab now.
1318 ASSERT_EQ(1, browser()->tab_strip_model()->count()); 1320 ASSERT_EQ(1, browser()->tab_strip_model()->count());
1319 } 1321 }
1320 1322
1321 #if !defined(OS_MACOSX) 1323 #if !defined(OS_MACOSX)
1322 // Open with --app-id=<id>, and see that an app window opens. 1324 // Open with --app-id=<id>, and see that an app window opens.
(...skipping 1397 matching lines...) Expand 10 before | Expand all | Expand 10 after
2720 #endif 2722 #endif
2721 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2723 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2722 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2724 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2723 gfx::Size exp_final_size(initial_wcv_size); 2725 gfx::Size exp_final_size(initial_wcv_size);
2724 exp_final_size.Enlarge(wcv_resize_insets.width(), 2726 exp_final_size.Enlarge(wcv_resize_insets.width(),
2725 wcv_resize_insets.height() + height_inset); 2727 wcv_resize_insets.height() + height_inset);
2726 EXPECT_EQ(exp_final_size, 2728 EXPECT_EQ(exp_final_size,
2727 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2729 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2728 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); 2730 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
2729 } 2731 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698