Temporarily re-enabling SizeAfterPrefChange test with traces

chrome/browser/extensions/extension_toolbar_model_browsertest.cc

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 7caba8d03163810d3e387bbf1cbd971dad1f9148..1a51d40c32425c55ef9fe5f6786b8595621159e2 100644
--- a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
+++ b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
@@ -27,6 +27,14 @@ 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);
@@ -584,36 +592,32 @@ IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, HighlightModeAdd) {
   EXPECT_EQ(id_c, ExtensionAt(2)->id());
 }
 
-// Test is flaky on Linus and ChromeOS, see crbug.com/379170.
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-#define MAYBE_SizeAfterPrefChange DISABLED_SizeAfterPrefChange
-#else
-#define MAYBE_SizeAfterPrefChange SizeAfterPrefChange
-#endif
-IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, MAYBE_SizeAfterPrefChange) {
+// Test is flaky (see crbug.com/379170), but currently enabled to gather traces.
+// If it fails, ping Finnur.
+IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, SizeAfterPrefChange) {
   // Load two extensions with browser action.
   base::FilePath extension_a_path(test_data_dir_.AppendASCII("api_test")
                                                 .AppendASCII("browser_action")
                                                 .AppendASCII("basics"));
-  LOG(ERROR) << "Loading [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"));
-  LOG(ERROR) << "Loading [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();
 
-  LOG(ERROR) << "GetVisibleIconCount";
+  VLOG(4) << "GetVisibleIconCount";
 
   // Should be at max size (-1).
   EXPECT_EQ(-1, model_->GetVisibleIconCount());
 
-  LOG(ERROR) << "OnExtensionToolbarPrefChange";
+  VLOG(4) << "OnExtensionToolbarPrefChange";
   model_->OnExtensionToolbarPrefChange();
 
-  LOG(ERROR) << "GetVisibleIconCount";
+  VLOG(4) << "GetVisibleIconCount";
 
   // Should still be at max size.
   EXPECT_EQ(-1, model_->GetVisibleIconCount());