Reland: [chromecast] Make testnames consistent.

chromecast/browser/test/cast_browser_test.h

Index: chromecast/browser/test/cast_browser_test.h
diff --git a/chromecast/browser/test/chromecast_browser_test.h b/chromecast/browser/test/cast_browser_test.h
similarity index 70%
rename from chromecast/browser/test/chromecast_browser_test.h
rename to chromecast/browser/test/cast_browser_test.h
index 7a6dfe92fe26feddbaee5c3a2da2395aa8e5cc10..dfb25ebd02c1dfa2e537fc23e5e020529275f368 100644
--- a/chromecast/browser/test/chromecast_browser_test.h
+++ b/chromecast/browser/test/cast_browser_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMECAST_BROWSER_TEST_CHROMECAST_BROWSER_TEST_H_
-#define CHROMECAST_BROWSER_TEST_CHROMECAST_BROWSER_TEST_H_
+#ifndef CHROMECAST_BROWSER_TEST_CAST_BROWSER_TEST_H_
+#define CHROMECAST_BROWSER_TEST_CAST_BROWSER_TEST_H_
 
 #include <memory>
 
@@ -25,15 +25,16 @@ class CastContentWindow;
 // case, then shuts down the entire shell.
 // Note that this process takes 7-10 seconds per test case on Chromecast, so
 // fewer test cases with more assertions are preferable.
-class ChromecastBrowserTest : public content::BrowserTestBase {
+class CastBrowserTest : public content::BrowserTestBase {
  protected:
-  ChromecastBrowserTest();
-  ~ChromecastBrowserTest() override;
+  CastBrowserTest();
+  ~CastBrowserTest() override;
 
   // content::BrowserTestBase implementation:
-  void SetUp() override;
+  void SetUp() final;
   void TearDownOnMainThread() override;
-  void RunTestOnMainThreadLoop() override;
+  void SetUpCommandLine(base::CommandLine* command_line) override;
+  void RunTestOnMainThreadLoop() final;
 
   content::WebContents* NavigateToURL(const GURL& url);
 
@@ -41,10 +42,10 @@ class ChromecastBrowserTest : public content::BrowserTestBase {
   std::unique_ptr<CastContentWindow> window_;
   std::unique_ptr<content::WebContents> web_contents_;
 
-  DISALLOW_COPY_AND_ASSIGN(ChromecastBrowserTest);
+  DISALLOW_COPY_AND_ASSIGN(CastBrowserTest);
 };
 
 }  // namespace shell
 }  // namespace chromecast
 
-#endif  // CHROMECAST_BROWSER_TEST_CHROMECAST_BROWSER_TEST_H_
+#endif  // CHROMECAST_BROWSER_TEST_CAST_BROWSER_TEST_H_