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

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

Issue 284103002: Replace "external_install" boolean parameter with explicit enumeration in ExtensionUninstall method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address issue exposed by failing unit test. Created 6 years, 5 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 <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 1289 matching lines...) Expand 10 before | Expand all | Expand 10 after
1300 TabStripModel::ADD_NONE); 1300 TabStripModel::ADD_NONE);
1301 model->SetTabPinned(0, true); 1301 model->SetTabPinned(0, true);
1302 ui_test_utils::NavigateToURL(browser(), url); 1302 ui_test_utils::NavigateToURL(browser(), url);
1303 1303
1304 MockTabStripModelObserver observer; 1304 MockTabStripModelObserver observer;
1305 model->AddObserver(&observer); 1305 model->AddObserver(&observer);
1306 1306
1307 // Uninstall the extension and make sure TabClosing is sent. 1307 // Uninstall the extension and make sure TabClosing is sent.
1308 ExtensionService* service = extensions::ExtensionSystem::Get( 1308 ExtensionService* service = extensions::ExtensionSystem::Get(
1309 browser()->profile())->extension_service(); 1309 browser()->profile())->extension_service();
1310 service->UninstallExtension(GetExtension()->id(), false, NULL); 1310 service->UninstallExtension(GetExtension()->id(),
1311 ExtensionService::UNINSTALL_REASON_FOR_TESTING,
1312 NULL);
1311 EXPECT_EQ(1, observer.closing_count()); 1313 EXPECT_EQ(1, observer.closing_count());
1312 1314
1313 model->RemoveObserver(&observer); 1315 model->RemoveObserver(&observer);
1314 1316
1315 // There should only be one tab now. 1317 // There should only be one tab now.
1316 ASSERT_EQ(1, browser()->tab_strip_model()->count()); 1318 ASSERT_EQ(1, browser()->tab_strip_model()->count());
1317 } 1319 }
1318 1320
1319 #if !defined(OS_MACOSX) 1321 #if !defined(OS_MACOSX)
1320 // Open with --app-id=<id>, and see that an app window opens. 1322 // Open with --app-id=<id>, and see that an app window opens.
(...skipping 1369 matching lines...) Expand 10 before | Expand all | Expand 10 after
2690 #endif 2692 #endif
2691 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2693 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2692 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2694 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2693 gfx::Size exp_final_size(initial_wcv_size); 2695 gfx::Size exp_final_size(initial_wcv_size);
2694 exp_final_size.Enlarge(wcv_resize_insets.width(), 2696 exp_final_size.Enlarge(wcv_resize_insets.width(),
2695 wcv_resize_insets.height() + height_inset); 2697 wcv_resize_insets.height() + height_inset);
2696 EXPECT_EQ(exp_final_size, 2698 EXPECT_EQ(exp_final_size,
2697 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2699 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2698 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); 2700 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
2699 } 2701 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698