diff options
| author | mpearson <mpearson@chromium.org> | 2015-04-14 15:57:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-14 22:57:38 +0000 |
| commit | 907fe612f5949ef8a6c2fe3bd00ddd1c423f9f20 (patch) | |
| tree | 186ff0fc3418305790da1ba38f944ede10dbbaaf /chromeos/network/network_state_handler.h | |
| parent | b2514f2ff2933c9138a055c8ac296f102f2dd033 (diff) | |
| download | chromium_src-907fe612f5949ef8a6c2fe3bd00ddd1c423f9f20.zip chromium_src-907fe612f5949ef8a6c2fe3bd00ddd1c423f9f20.tar.gz chromium_src-907fe612f5949ef8a6c2fe3bd00ddd1c423f9f20.tar.bz2 | |
Revert of Use networkingPrivate.startConnect (patchset #12 id:240001 of https://codereview.chromium.org/1043343002/)
Reason for revert:
Causes browser_test failure on Win7 bot.
https://build.chromium.org/p/chromium.win/builders/Win%207%20Tests%20x64%20(1)
[ RUN ] WebNavigationApiTest.Failures
[4444:4508:0414/144708:WARNING:data_reduction_proxy_config.cc(319)] SPDY proxy OFF at startup
[4444:2028:0414/144708:ERROR:bluetooth_adapter_win.cc(102)] NOT IMPLEMENTED
[180:3848:0414/144709:WARNING:raw_channel_win.cc(473)] WriteFile: Error (0x5) while retrieving error. (0xE8)
[180:3848:0414/144709:WARNING:channel.cc(549)] Failed to send message to ack remove remote endpoint (local ID 2147483650, remote ID 3)
[180:3848:0414/144709:WARNING:channel.cc(315)] RawChannel write error
[180:3848:0414/144709:WARNING:raw_channel_win.cc(473)] WriteFile: Error (0x3B01) while retrieving error. (0xE8)
[180:3848:0414/144709:WARNING:channel.cc(549)] Failed to send message to ack remove remote endpoint (local ID 1, remote ID 1)
[180:3848:0414/144709:WARNING:channel.cc(315)] RawChannel write error
[4444:2028:0414/144709:INFO:CONSOLE(0)] "[SUCCESS] nonExistentIframe", source: chrome-extension://ollhgkgdokpphndfogkepkmblokamlkf/test_failures.html (0)
[4444:2028:0414/144710:INFO:CONSOLE(0)] "[SUCCESS] nonExistentIframeNavigation", source: chrome-extension://ollhgkgdokpphndfogkepkmblokamlkf/test_failures.html (0)
[4444:2028:0414/144710:INFO:CONSOLE(0)] "[FAIL] cancel: Received unexpected event 'onCompleted':{"frameId":0,"processId":0,"tabId":0,"timeStamp":0,"url":"chrome-extension://ollhgkgdokpphndfogkepkmblokamlkf/e.html"}
Error
at captureEvent (chrome-extension://ollhgkgdokpphndfogkepkmblokamlkf/framework.js:194:17)
at chrome-extension://ollhgkgdokpphndfogkepkmblokamlkf/framework.js:219:5
at EventImpl.dispatchToListener (extensions::event_bindings:395:22)
at Event.publicClass.(anonymous function) [as dispatchToListener] (extensions::utils:94:26)
at EventImpl.dispatch_ (extensions::event_bindings:379:35)
at dispatchArgs (extensions::event_bindings:247:26)
at dispatchEvent (extensions::event_bindings:256:7)", source: chrome-extension://ollhgkgdokpphndfogkepkmblokamlkf/test_failures.html (0)
[4444:2028:0414/144710:INFO:CONSOLE(0)] "[SUCCESS] nonExistent", source: chrome-extension://ollhgkgdokpphndfogkepkmblokamlkf/test_failures.html (0)
c:\b\build\slave\win_x64_builder\build\src\chrome\browser\extensions\api\web_navigation\web_navigation_apitest.cc(468): error: Value of: RunExtensionTest("webnavigation/failures")
Actual: false
Expected: true
Failed 1 of 4 tests
[4444:2028:0414/144710:ERROR:browser_thread.h(263)] DeleteSoon failed on thread 0
[ FAILED ] WebNavigationApiTest.Failures, where TypeParam = and GetParam() = (2465 ms)
Original issue's description:
> Use networkingPrivate.startConnect
>
> This adds checks for unconfigured or non-activated networks to internet_details.js since it no longer uses the checks in network_connect.cc.
> It also moves some notification handling from network_connect.cc to network_state_notifier.cc so that it does not rely on network_connect.cc.
>
> BUG=430115
>
> Committed: https://crrev.com/e22e5bcbad2cea941993b32e6cc3b082822a42fc
> Cr-Commit-Position: refs/heads/master@{#325108}
TBR=armansito@chromium.org,michaelpg@chromium.org,pneubeck@chromium.org,stevenjb@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=430115
Review URL: https://codereview.chromium.org/1085993002
Cr-Commit-Position: refs/heads/master@{#325145}
Diffstat (limited to 'chromeos/network/network_state_handler.h')
| -rw-r--r-- | chromeos/network/network_state_handler.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chromeos/network/network_state_handler.h b/chromeos/network/network_state_handler.h index f032f77..135d225 100644 --- a/chromeos/network/network_state_handler.h +++ b/chromeos/network/network_state_handler.h @@ -224,10 +224,6 @@ class CHROMEOS_EXPORT NetworkStateHandler return default_network_path_; } - // Sets the |last_error_| property of the matching NetworkState for tests. - void SetLastErrorForTest(const std::string& service_path, - const std::string& error); - // Constructs and initializes an instance for testing. static NetworkStateHandler* InitializeForTest(); |