Merge pull request #725 from uazo/fix-proxy-patch

fix proxy settings patch with always incognito profile

build/patches/Add-a-proxy-configuration-page.patch

@@ -674,7 +674,7 @@ new file mode 100644
 +      weak_ptr_factory_(this) {
 +
 +  // used to set new configuration preferences
-+  profile_ = profile;
++  profile_ = profile->GetOriginalProfile();
 +  // observer is explicitly added only later in enableNotifyUIWithState
 +  is_observing_ = false;
 +
@@ -1241,6 +1241,3 @@ diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_co
  
      // Returns one of {&proxies_for_http, &proxies_for_https, &proxies_for_ftp,
      // &fallback_proxies}, or NULL if there is no proxy to use.
--- 
-2.17.1
-