diff options
| author | dtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-26 00:33:21 +0000 |
|---|---|---|
| committer | dtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-26 00:33:21 +0000 |
| commit | 8989bb4acf8e75ebbdf50d0fd2145fcbbdfc928a (patch) | |
| tree | c3909c42ab25b1d4c3a769ca5d75c21685e598a5 /chrome/browser/automation/automation_provider.cc | |
| parent | 67c5be79a53904e4ab5a6617bf9cbad9f7f5de6f (diff) | |
| download | chromium_src-8989bb4acf8e75ebbdf50d0fd2145fcbbdfc928a.zip chromium_src-8989bb4acf8e75ebbdf50d0fd2145fcbbdfc928a.tar.gz chromium_src-8989bb4acf8e75ebbdf50d0fd2145fcbbdfc928a.tar.bz2 | |
ConnectToWifiNetwork() is now blocking.
Add DisconnectFromWifiNetwork(), which is also blocking.
Add NetworkScan(), which is also blocking.
Move chromeos automation observers into their own file.
Add better error message for when automation calls time out.
BUG=chromium-os:12727
TEST=Mostly manual. Automated tests will be set up in a lab with real wifi access points.
Review URL: http://codereview.chromium.org/6732040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79476 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_provider.cc')
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index cbc7123..c8de882 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -178,7 +178,9 @@ bool AutomationProvider::InitializeChannel(const std::string& channel_id) { // Wait for the network manager to initialize. // The observer will delete itself when done. network_library_initialized_ = false; - new NetworkManagerInitObserver(this); + NetworkManagerInitObserver* observer = new NetworkManagerInitObserver(this); + if (!observer->Init()) + delete observer; #endif TRACE_EVENT_END("AutomationProvider::InitializeChannel", 0, ""); |