Separate handler initialization from page initialization

chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.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/ui/webui/options2/chromeos/bluetooth_options_handler2.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 148 matching lines @@
   web_ui()->RegisterMessageCallback("stopBluetoothDeviceDiscovery",
       base::Bind(&BluetoothOptionsHandler::StopDiscoveryCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("getPairedBluetoothDevices",
       base::Bind(&BluetoothOptionsHandler::GetPairedDevicesCallback,
                  base::Unretained(this)));
 }
 
 void BluetoothOptionsHandler::InitializeHandler() {
   adapter_.reset(BluetoothAdapter::CreateDefaultAdapter());
-  adapter_->AddObserver(this);
 }
 
 void BluetoothOptionsHandler::InitializePage() {
+  adapter_->AddObserver(this);
+
   // Show or hide the bluetooth settings and update the checkbox based
   // on the current present/powered state.
   AdapterPresentChanged(adapter_.get(), adapter_->IsPresent());
   // Automatically start device discovery if the "Add Bluetooth Device"
   // overlay is visible.
   web_ui()->CallJavascriptFunction(
       "options.BluetoothOptions.updateDiscovery");
 }
 
 void BluetoothOptionsHandler::EnableChangeCallback(
@@ skipping 228 matching lines @@
   DCHECK(device);
 
   base::StringValue address(device->address());
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.removeBluetoothDevice",
       address);
 }
 
 }  // namespace options2
 }  // namespace chromeos