Remove unused Views Translate InfoBar code.

chrome/browser/translate/translate_browsertest.cc

 // Copyright 2013 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/command_line.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 36 matching lines @@
 };  // namespace
 
 class TranslateBrowserTest : public InProcessBrowserTest {
  public:
   TranslateBrowserTest()
       : https_server_(net::SpawnedTestServer::TYPE_HTTPS,
                       SSLOptions(SSLOptions::CERT_OK),
                       base::FilePath(kTranslateRoot)),
         infobar_service_(NULL) {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
-    TranslateService::SetUseInfobar(true);
-  }
-
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ASSERT_TRUE(https_server_.Start());
     // Setup alternate security origin for testing in order to allow XHR against
     // local test server. Note that this flag shows a confirm infobar in tests.
     GURL base_url = GetSecureURL("");
     command_line->AppendSwitchASCII(
         translate::switches::kTranslateSecurityOrigin,
         base_url.GetOrigin().spec());
   }
 
@@ skipping 49 matching lines @@
  private:
   net::SpawnedTestServer https_server_;
   InfoBarService* infobar_service_;
 
   typedef net::SpawnedTestServer::SSLOptions SSLOptions;
 
   DISALLOW_COPY_AND_ASSIGN(TranslateBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, TranslateInIsolatedWorld) {
-#if defined(OS_WIN) && defined(USE_ASH)
-  // Disable this test in Metro+Ash for now (http://crbug.com/262796).
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+  // This test only applies to the infobar translate UX, not the new bubble UX.

[Takashi Toyoshima, 2014/06/11 04:54:32]

IIUC, with this change, these tests are changed to run only on mac, right?
These tests should not be just skipped for other platforms. We need to consider
tests for same cases with bubble UI. If you want to remove infobar code just
now, can you file a bug and add TODO to make them work again?

[msw, 2014/06/11 07:31:20]

I filed Issue 383235 and added TODOs. Most of these tests should be
infobar/bubble agnostic, and actual UX tests should be ported for the bubble
translate UX. There's not much point in testing disabled Views infobar UX
though, and the already incomplete testing probably shouldn't block removal of
otherwise unused code. I might be able to help cleanup the tests sometime.

Lmk if you prefer keeping some dead code around for testing. Perhaps I can
stub/remove more limited Views infobar code that we don't wish to continue
supporting (like custom TextButtonBorders for the info MenuButton instances).

+  if (TranslateService::IsTranslateBubbleEnabled())
     return;
-#endif
 
   net::TestURLFetcherFactory factory;
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Check if there is no Translate infobar.
   TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 
   // Setup infobar observer.
   content::WindowedNotificationObserver infobar(
@@ skipping 44 matching lines @@
   fetcher->set_response_code(net::HTTP_OK);
   fetcher->SetResponseString(element_js);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   // Wait for the page title is changed after the test finished.
   const base::string16 result = watcher.WaitAndGetTitle();
   EXPECT_EQ("PASS", base::UTF16ToASCII(result));
 }
 
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTag) {
-#if defined(OS_WIN) && defined(USE_ASH)
-  // Disable this test in Metro+Ash for now (http://crbug.com/262796).
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
     return;
-#endif
 
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Check if there is no Translate infobar.
   TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 
   // Setup page title observer.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
@@ skipping 10 matching lines @@
   const base::string16 result = watcher.WaitAndGetTitle();
   EXPECT_EQ("PASS", base::UTF16ToASCII(result));
 
   // Check if there is no Translate infobar.
   translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 }
 
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest,
                        IgnoreRefreshMetaTagInCaseInsensitive) {
-#if defined(OS_WIN) && defined(USE_ASH)
-  // Disable this test in Metro+Ash for now (http://crbug.com/262796).
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
     return;
-#endif
 
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Check if there is no Translate infobar.
   TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 
   // Setup page title observer.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents);
   content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));
   watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
 
   // Visit a test page.
   ui_test_utils::NavigateToURL(
       browser(),
       GetNonSecureURL(kRefreshMetaTagCaseInsensitiveTestPath));
 
   // Wait for the page title is changed after the test finished.
   const base::string16 result = watcher.WaitAndGetTitle();
   EXPECT_EQ("PASS", base::UTF16ToASCII(result));
 
   // Check if there is no Translate infobar.
   translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 }
 
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTagAtOnload) {
-#if defined(OS_WIN) && defined(USE_ASH)
-  // Disable this test in Metro+Ash for now (http://crbug.com/262796).
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
     return;
-#endif
 
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Check if there is no Translate infobar.
   TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 
   // Setup page title observer.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents);
   content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));
   watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
 
   // Visit a test page.
   ui_test_utils::NavigateToURL(
       browser(),
       GetNonSecureURL(kRefreshMetaTagAtOnloadTestPath));
 
   // Wait for the page title is changed after the test finished.
   const base::string16 result = watcher.WaitAndGetTitle();
   EXPECT_EQ("PASS", base::UTF16ToASCII(result));
 
   // Check if there is no Translate infobar.
   translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 }
 
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocation) {
-#if defined(OS_WIN) && defined(USE_ASH)
-  // Disable this test in Metro+Ash for now (http://crbug.com/262796).
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
     return;
-#endif
 
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Check if there is no Translate infobar.
   TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 
   // Setup page title observer.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents);
   content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));
   watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
 
   // Visit a test page.
   ui_test_utils::NavigateToURL(
       browser(),
       GetNonSecureURL(kUpdateLocationTestPath));
 
   // Wait for the page title is changed after the test finished.
   const base::string16 result = watcher.WaitAndGetTitle();
   EXPECT_EQ("PASS", base::UTF16ToASCII(result));
 
   // Check if there is no Translate infobar.
   translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 }
 
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocationAtOnload) {
-#if defined(OS_WIN) && defined(USE_ASH)
-  // Disable this test in Metro+Ash for now (http://crbug.com/262796).
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
     return;
-#endif
 
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Check if there is no Translate infobar.
   TranslateInfoBarDelegate* translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 
   // Setup page title observer.
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents);
   content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));
   watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
 
   // Visit a test page.
   ui_test_utils::NavigateToURL(
       browser(),
       GetNonSecureURL(kUpdateLocationAtOnloadTestPath));
 
   // Wait for the page title is changed after the test finished.
   const base::string16 result = watcher.WaitAndGetTitle();
   EXPECT_EQ("PASS", base::UTF16ToASCII(result));
 
   // Check if there is no Translate infobar.
   translate = GetExistingTranslateInfoBarDelegate();
   EXPECT_FALSE(translate);
 }