Fix app shim focus.

apps/app_shim/extension_app_shim_handler_mac_unittest.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 "apps/app_shim/extension_app_shim_handler_mac.h"
 
 #include "apps/app_shim/app_shim_host_mac.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 196 matching lines @@
   // Normal startup.
   handler_->OnShimLaunch(&host_aa_, normal_launch);
   EXPECT_EQ(&host_aa_, handler_->FindHost(&profile_a_, kTestAppIdA));
 
   handler_->OnShimLaunch(&host_ab_, normal_launch);
   EXPECT_EQ(&host_ab_, handler_->FindHost(&profile_a_, kTestAppIdB));
 
   handler_->OnShimLaunch(&host_bb_, normal_launch);
   EXPECT_EQ(&host_bb_, handler_->FindHost(&profile_b_, kTestAppIdB));
 
-  // Activation when there is a registered shim finishes launch with success.
+  // Activation when there is a registered shim finishes launch with success and
+  // focuses the app.
   EXPECT_CALL(host_aa_, OnAppLaunchComplete(APP_SHIM_LAUNCH_SUCCESS));
+  EXPECT_CALL(*handler_, OnShimFocus(&host_aa_, APP_SHIM_FOCUS_NORMAL));
   handler_->OnAppActivated(&profile_a_, kTestAppIdA);
 
   // Starting and closing a second host just focuses the app.
   EXPECT_CALL(*handler_, OnShimFocus(&host_aa_duplicate_,
                                      APP_SHIM_FOCUS_REOPEN));
   EXPECT_CALL(host_aa_duplicate_,
               OnAppLaunchComplete(APP_SHIM_LAUNCH_DUPLICATE_HOST));
   handler_->OnShimLaunch(&host_aa_duplicate_, normal_launch);
   EXPECT_EQ(&host_aa_, handler_->FindHost(&profile_a_, kTestAppIdA));
   handler_->OnShimClose(&host_aa_duplicate_);
@@ skipping 103 matching lines @@
       .WillRepeatedly(Return(&profile_a_));
   EXPECT_CALL(*delegate_, LoadProfileAsync(profile_path_a_, _))
       .WillOnce(Invoke(delegate_, &MockDelegate::CaptureLoadProfileCallback));
   handler_->OnShimLaunch(&host_aa_, APP_SHIM_LAUNCH_NORMAL);
   EXPECT_FALSE(handler_->FindHost(&profile_a_, kTestAppIdA));
   delegate_->RunLoadProfileCallback(profile_path_a_, &profile_a_);
   EXPECT_TRUE(handler_->FindHost(&profile_a_, kTestAppIdA));
 }
 
 }  // namespace apps