Refactor extension handling code from AppShimHost into ExtensionAppShimHandler.

apps/app_shim/app_shim_host_mac_unittest.cc

Index: apps/app_shim/app_shim_host_mac_unittest.cc
diff --git a/apps/app_shim/app_shim_host_mac_unittest.cc b/apps/app_shim/app_shim_host_mac_unittest.cc
index 476b2ceb43748126aa5fe940e232f1c119215184..c382ff8e0d3cf6444cc9eaf9174656fdc6aaa7d7 100644
--- a/apps/app_shim/app_shim_host_mac_unittest.cc
+++ b/apps/app_shim/app_shim_host_mac_unittest.cc
@@ -31,18 +31,9 @@ class TestingAppShimHost : public AppShimHost {
     fails_launch_ = fails_launch;
   }
 
-  const std::string& GetAppId() const {
-    return app_id();
-  }
-
-  const Profile* GetProfile() const {
-    return profile();
-  }
-
  protected:
   virtual Profile* FetchProfileForDirectory(const std::string& profile_dir)
       OVERRIDE;
-  virtual bool LaunchApp(Profile* profile) OVERRIDE;
   virtual bool Send(IPC::Message* message) OVERRIDE;
 
  private:
@@ -77,10 +68,6 @@ Profile* TestingAppShimHost::FetchProfileForDirectory(
   return fails_profile_ ? NULL : test_profile_;
 }
 
-bool TestingAppShimHost::LaunchApp(Profile* profile) {
-  return !fails_launch_;
-}
-
 class AppShimHostTest : public testing::Test,
                         public apps::AppShimHandler {
  public:
@@ -117,6 +104,7 @@ class AppShimHostTest : public testing::Test,
 
  private:
   virtual void SetUp() OVERRIDE {
+    testing::Test::SetUp();
     profile_.reset(new TestingProfile);
     host_.reset(new TestingAppShimHost(profile()));
   }
@@ -132,19 +120,12 @@ const char kTestProfileDir[] = "Default";
 
 }  // namespace
 
-TEST_F(AppShimHostTest, TestLaunchApp) {
-  host()->ReceiveMessage(
-      new AppShimHostMsg_LaunchApp(kTestProfileDir, kTestAppId));
-  ASSERT_EQ(kTestAppId, host()->GetAppId());
-  ASSERT_EQ(profile(), host()->GetProfile());
-  ASSERT_TRUE(LaunchWasSuccessful());
-}
-
 TEST_F(AppShimHostTest, TestLaunchAppWithHandler) {
   apps::AppShimHandler::RegisterHandler(kTestAppId, this);
   EXPECT_TRUE(host()->ReceiveMessage(
       new AppShimHostMsg_LaunchApp(kTestProfileDir, kTestAppId)));
-  EXPECT_EQ(kTestAppId, host()->GetAppId());
+  EXPECT_EQ(kTestAppId,
+            static_cast<apps::AppShimHandler::Host*>(host())->GetAppId());

[tapted, 2013/05/23 02:29:39]

Does implicit_cast work? (defined in src/base/basictypes.h)

[jackhou1, 2013/05/23 06:10:19]

Done.

   EXPECT_TRUE(LaunchWasSuccessful());
   EXPECT_EQ(1, launch_count_);
   EXPECT_EQ(0, focus_count_);