Adding ChromeLauncherController interface.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
similarity index 98%
rename from chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
rename to chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
index 8046a11d67c600844a3afc0b220f1ddc08a63219..eae5a0b2a8b1eef35cbfab29aa6a70083641c0d1 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
 
 #include <stddef.h>
 
@@ -82,6 +82,11 @@ using content::WebContents;
 
 namespace {
 
+ChromeLauncherControllerImpl* GetChromeLauncherControllerImpl() {
+  return static_cast<ChromeLauncherControllerImpl*>(
+      ChromeLauncherController::instance());
+}
+
 class TestEvent : public ui::Event {
  public:
   explicit TestEvent(ui::EventType type)
@@ -187,7 +192,7 @@ class LauncherPlatformAppBrowserTest
 
   void RunTestOnMainThreadLoop() override {
     shelf_ = ash::Shelf::ForPrimaryDisplay();
-    controller_ = ChromeLauncherController::instance();
+    controller_ = GetChromeLauncherControllerImpl();
     return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();
   }
 
@@ -236,7 +241,7 @@ class LauncherPlatformAppBrowserTest
   }
 
   ash::Shelf* shelf_;
-  ChromeLauncherController* controller_;
+  ChromeLauncherControllerImpl* controller_;
 
  private:
 
@@ -264,7 +269,7 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {
   void RunTestOnMainThreadLoop() override {
     shelf_ = ash::Shelf::ForPrimaryDisplay();
     model_ = ash::test::ShellTestApi(ash::Shell::GetInstance()).shelf_model();
-    controller_ = ChromeLauncherController::instance();
+    controller_ = GetChromeLauncherControllerImpl();
     return ExtensionBrowserTest::RunTestOnMainThreadLoop();
   }
 
@@ -388,7 +393,7 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {
 
   ash::Shelf* shelf_;
   ash::ShelfModel* model_;
-  ChromeLauncherController* controller_;
+  ChromeLauncherControllerImpl* controller_;
 
  private:
 

[msw, 2016/06/10 22:44:39]

optional nit: remove blank line

[mfomitchev, 2016/06/13 17:29:18]

Done.

@@ -899,9 +904,9 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchInBackground) {
   LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB,
                          NEW_BACKGROUND_TAB);
   EXPECT_EQ(++tab_count, tab_strip->count());
-  ChromeLauncherController::instance()->LaunchApp(last_loaded_extension_id(),
-                                                  ash::LAUNCH_FROM_UNKNOWN,
-                                                  0);
+  GetChromeLauncherControllerImpl()->LaunchApp(last_loaded_extension_id(),

[msw, 2016/06/10 22:44:38]

nit: use |controller_| here and in other fixtures below?

[mfomitchev, 2016/06/13 17:29:18]

Done.

+                                               ash::LAUNCH_FROM_UNKNOWN,
+                                               0);
 }
 
 // Confirm that clicking a icon for an app running in one of 2 maxmized windows
@@ -941,13 +946,13 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, ActivateApp) {
   const Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("app1"));
 
-  ChromeLauncherController::instance()->ActivateApp(extension->id(),
-                                                    ash::LAUNCH_FROM_UNKNOWN,
-                                                    0);
+  GetChromeLauncherControllerImpl()->ActivateApp(extension->id(),
+                                                 ash::LAUNCH_FROM_UNKNOWN,
+                                                 0);
   EXPECT_EQ(++tab_count, tab_strip->count());
-  ChromeLauncherController::instance()->ActivateApp(extension->id(),
-                                                    ash::LAUNCH_FROM_UNKNOWN,
-                                                    0);
+  GetChromeLauncherControllerImpl()->ActivateApp(extension->id(),
+                                                 ash::LAUNCH_FROM_UNKNOWN,
+                                                 0);
   EXPECT_EQ(tab_count, tab_strip->count());
 }
 
@@ -958,13 +963,13 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchApp) {
   const Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("app1"));
 
-  ChromeLauncherController::instance()->LaunchApp(extension->id(),
-                                                  ash::LAUNCH_FROM_UNKNOWN,
-                                                  0);
+  GetChromeLauncherControllerImpl()->LaunchApp(extension->id(),
+                                               ash::LAUNCH_FROM_UNKNOWN,
+                                               0);
   EXPECT_EQ(++tab_count, tab_strip->count());
-  ChromeLauncherController::instance()->LaunchApp(extension->id(),
-                                                  ash::LAUNCH_FROM_UNKNOWN,
-                                                  0);
+  GetChromeLauncherControllerImpl()->LaunchApp(extension->id(),
+                                               ash::LAUNCH_FROM_UNKNOWN,
+                                               0);
   EXPECT_EQ(++tab_count, tab_strip->count());
 }