Fix extension toolstrip background update code

chrome/browser/extensions/extension_browsertests_misc.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/ref_counted.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
@@ skipping 32 matching lines @@
       EXPECT_FALSE(host);
       host = *iter;
     }
     num_hosts++;
   }
   EXPECT_EQ(expected_hosts, num_hosts);
   return host;
 }
 
 // Tests that toolstrips initializes properly and can run basic extension js.
-// Disabled, see bug 22135
-IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_Toolstrip) {
+IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, Toolstrip) {
   FilePath extension_test_data_dir = test_data_dir_.AppendASCII("good").
       AppendASCII("Extensions").AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj").
       AppendASCII("1.0.0.0");
   ASSERT_TRUE(LoadExtension(extension_test_data_dir));
 
   // At this point, there should be three ExtensionHosts loaded because this
   // extension has two toolstrips and one background page. Find the one that is
   // hosting toolstrip1.html.
   ExtensionProcessManager* manager =
       browser()->profile()->GetExtensionProcessManager();
@@ skipping 16 matching lines @@
       browser(),
       GURL(language_url.ToWStringHack()));
 
   ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host->render_view_host(), L"", L"testTabsLanguageAPI()", &result);
   EXPECT_TRUE(result);
 #endif
 }
 
 #if defined(OS_WIN)  // TODO(port) -- enable
-// Disabled, see bug 22135
-IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DIABLED_ExtensionViews) {
+IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, ExtensionViews) {
   FilePath extension_test_data_dir = test_data_dir_.AppendASCII("good").
       AppendASCII("Extensions").AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj").
       AppendASCII("1.0.0.0");
   ASSERT_TRUE(LoadExtension(extension_test_data_dir));
 
   // At this point, there should be three ExtensionHosts loaded because this
   // extension has two toolstrips and one background page. Find the one that is
   // hosting toolstrip1.html.
   ExtensionProcessManager* manager =
       browser()->profile()->GetExtensionProcessManager();
@@ skipping 519 matching lines @@
       browser(),
       GURL("about:blank"),
       "chrome-extension://" kDefaultExtensionID "/newtab.html");
 
   // Extension API should fail.
   bool result = false;
   ui_test_utils::ExecuteJavaScriptAndExtractBool(
       newtab->render_view_host(), L"", L"testExtensionApi()", &result);
   EXPECT_FALSE(result);
 }