| Index: chrome/browser/extensions/extension_toolbar_model_browsertest.cc
|
| diff --git a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
|
| index 1a51d40c32425c55ef9fe5f6786b8595621159e2..f01b30e18a6129fc8e109f9950cf805a84a9493c 100644
|
| --- a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
|
| +++ b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
|
| @@ -27,14 +27,6 @@ class ExtensionToolbarModelTest : public ExtensionBrowserTest,
|
| ExtensionBrowserTest::SetUp();
|
| }
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| - ExtensionBrowserTest::SetUpCommandLine(command_line);
|
| -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
| - command_line->AppendSwitchNative(
|
| - "vmodule", "*extension_toolbar_model*=4,*browser_actions_container*=4");
|
| -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
|
| - }
|
| -
|
| virtual void SetUpOnMainThread() OVERRIDE {
|
| model_ = ExtensionToolbarModel::Get(browser()->profile());
|
| model_->AddObserver(this);
|
| @@ -599,26 +591,19 @@ IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, SizeAfterPrefChange) {
|
| base::FilePath extension_a_path(test_data_dir_.AppendASCII("api_test")
|
| .AppendASCII("browser_action")
|
| .AppendASCII("basics"));
|
| - VLOG(4) << "Loading [basics]";
|
| ASSERT_TRUE(LoadExtension(extension_a_path));
|
| base::FilePath extension_b_path(test_data_dir_.AppendASCII("api_test")
|
| .AppendASCII("browser_action")
|
| .AppendASCII("popup"));
|
| - VLOG(4) << "Loading [popup]";
|
| ASSERT_TRUE(LoadExtension(extension_b_path));
|
| std::string id_a = ExtensionAt(0)->id();
|
| std::string id_b = ExtensionAt(1)->id();
|
|
|
| - VLOG(4) << "GetVisibleIconCount";
|
| -
|
| // Should be at max size (-1).
|
| EXPECT_EQ(-1, model_->GetVisibleIconCount());
|
|
|
| - VLOG(4) << "OnExtensionToolbarPrefChange";
|
| model_->OnExtensionToolbarPrefChange();
|
|
|
| - VLOG(4) << "GetVisibleIconCount";
|
| -
|
| // Should still be at max size.
|
| EXPECT_EQ(-1, model_->GetVisibleIconCount());
|
| }
|
|
|