More unittests passing with new focus controller.

ash/shell.h

Index: ash/shell.h
===================================================================
--- ash/shell.h	(revision 172961)
+++ ash/shell.h	(working copy)
@@ -336,6 +336,9 @@
   PartialMagnificationController* partial_magnification_controller() {
     return partial_magnification_controller_.get();
   }
+  aura::client::ActivationClient* activation_client() {
+    return activation_client_;
+  }
 
   ScreenAsh* screen() { return screen_; }
 
@@ -403,10 +406,6 @@
     browser_context_ = browser_context;
   }
 
-  aura::client::ActivationClient* activation_client() {
-    return activation_client_;
-  }
-
   // Initializes the root window to be used for a secondary display.
   void InitRootWindowForSecondaryDisplay(aura::RootWindow* root);