Fix a crash of WebView in ash_shell on Chrome OS build.

BUG=125063
TEST=Checked WebView example doesn't crash

Review URL: http://codereview.chromium.org/10191031

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

1 files changed, 18 insertions, 3 deletions

diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 6df9ce9..72b4555 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -379,6 +379,20 @@ class BadProxyListNetLogParam : public NetLog::EventParameters {
   DISALLOW_COPY_AND_ASSIGN(BadProxyListNetLogParam);
 };
 
+#if defined(OS_CHROMEOS)
+class UnsetProxyConfigService : public ProxyConfigService {
+ public:
+  UnsetProxyConfigService() {}
+  virtual ~UnsetProxyConfigService() {}
+
+  virtual void AddObserver(Observer* observer) {}
+  virtual void RemoveObserver(Observer* observer) {}
+  virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) {
+    return CONFIG_UNSET;
+  }
+};
+#endif
+
 }  // namespace
 
 // ProxyService::InitProxyResolver --------------------------------------------
@@ -1405,9 +1419,10 @@ ProxyConfigService* ProxyService::CreateSystemProxyConfigService(
 #elif defined(OS_MACOSX)
   return new ProxyConfigServiceMac(io_loop);
 #elif defined(OS_CHROMEOS)
-  NOTREACHED() << "ProxyConfigService for ChromeOS should be created in "
-               << "profile_io_data.cc::CreateProxyConfigService.";
-  return NULL;
+  LOG(ERROR) << "ProxyConfigService for ChromeOS should be created in "
+             << "profile_io_data.cc::CreateProxyConfigService and this should "
+             << "be used only for examples.";
+  return new UnsetProxyConfigService;
 #elif defined(OS_LINUX)
   ProxyConfigServiceLinux* linux_config_service =
       new ProxyConfigServiceLinux();