ChromeOS: IBusControllerTest.TestCreate needs to call IBusDaemonController::Shutdown().

TBR=satorux1 for trivial cleanup in chromeos/

Review URL: https://chromiumcodereview.appspot.com/12716016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188354 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 5 deletions

diff --git a/chromeos/ime/ibus_daemon_controller.cc b/chromeos/ime/ibus_daemon_controller.cc
index 290c31e..a0cc92e 100644
--- a/chromeos/ime/ibus_daemon_controller.cc
+++ b/chromeos/ime/ibus_daemon_controller.cc
@@ -338,10 +338,10 @@ void IBusDaemonController::Initialize(
 
 // static
 void IBusDaemonController::InitializeForTesting(
-    IBusDaemonController* controller_) {
+    IBusDaemonController* controller) {
   DCHECK(g_ibus_daemon_controller == NULL);
-  DCHECK(controller_);
-  g_ibus_daemon_controller = controller_;
+  DCHECK(controller);
+  g_ibus_daemon_controller = controller;
 }
 
 // static
diff --git a/chromeos/ime/ibus_daemon_controller.h b/chromeos/ime/ibus_daemon_controller.h
index 75deede..aa9d91c 100644
--- a/chromeos/ime/ibus_daemon_controller.h
+++ b/chromeos/ime/ibus_daemon_controller.h
@@ -35,7 +35,7 @@ class CHROMEOS_EXPORT IBusDaemonController {
   // Similar to Initialize(), but can inject alternative IBusDaemonController
   // such as MockIBusDaemonController for testing. The injected object object
   // will be owned by the internal pointer and deleted by Shutdown().
-  static void InitializeForTesting(IBusDaemonController* controller_);
+  static void InitializeForTesting(IBusDaemonController* controller);
 
   // Destroys the global instance.
   static void Shutdown();
@@ -57,7 +57,7 @@ class CHROMEOS_EXPORT IBusDaemonController {
   virtual bool Stop() = 0;
 
  protected:
-  // IBusDaemonController is managed as singleton. USe GetInstance instead.
+  // IBusDaemonController is managed as singleton. Use GetInstance instead.
   IBusDaemonController();
 
   DISALLOW_COPY_AND_ASSIGN(IBusDaemonController);