Decompose BrowserStateMonitor into two parts, simplifying unit tests and APIs.

chrome/browser/chromeos/input_method/input_method_manager_impl.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
 
 #include <algorithm>  // std::find
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "chrome/browser/chromeos/input_method/browser_state_monitor.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
 #include "chrome/browser/chromeos/input_method/input_method_delegate.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "unicode/uloc.h"
 
 namespace chromeos {
 namespace input_method {
@@ skipping 52 matching lines @@
       break;
     case STATE_BROWSER_SCREEN:
       if (old_state == STATE_LOCK_SCREEN)
         OnScreenUnlocked();
       break;
     case STATE_LOCK_SCREEN:
       OnScreenLocked();
       break;
     case STATE_TERMINATING: {
       ibus_controller_->Stop();
-      browser_state_monitor_.reset();  // For crbug.com/120183.
       if (candidate_window_controller_.get()) {
         candidate_window_controller_->Shutdown(ibus_controller_.get());
         candidate_window_controller_.reset();
       }
       break;
     }
   }
 }
 
 scoped_ptr<InputMethodDescriptors>
@@ skipping 477 matching lines @@
        ite != extra_input_method_instances_.end();
        ite++) {
     if (!Contains(filtered_extension_imes_, ite->first))
       ite->second->OnDisconnected();
   }
 }
 
 void InputMethodManagerImpl::Init() {
   DCHECK(!ibus_controller_.get());
 
-  browser_state_monitor_.reset(new BrowserStateMonitor(this, delegate_.get()));
   ibus_controller_.reset(IBusController::Create());
   xkeyboard_.reset(XKeyboard::Create(util_));
   ibus_controller_->AddObserver(this);
 }
 
 void InputMethodManagerImpl::SetIBusControllerForTesting(
     IBusController* ibus_controller) {
   ibus_controller_.reset(ibus_controller);
   ibus_controller_->AddObserver(this);
 }
@@ skipping 84 matching lines @@
   candidate_window_controller_.reset(
       CandidateWindowController::CreateCandidateWindowController());
   if (candidate_window_controller_->Init(ibus_controller_.get()))
     candidate_window_controller_->AddObserver(this);
   else
     DVLOG(1) << "Failed to initialize the candidate window controller";
 }
 
 }  // namespace input_method
 }  // namespace chromeos