Merge Chromium at 7.0.540.0 : Resolve conflicts.

connection.cc, statement.cc: SQL headers moved one level deeper.
http://src.chromium.org/viewvc/chrome?view=rev&revision=56619

base_paths_posix.cc: EnvVarGetter renamed to Environment.
http://src.chromium.org/viewvc/chrome?view=rev&revision=55326

logging.cc: VLOG added, skipping in Android to minimize bloat.
http://src.chromium.org/viewvc/chrome?view=rev&revision=60976

process_util, spellcheck_host_observer, url_fetcher:
Virtual destructors added (duplicating existing Android change).
http://src.chromium.org/viewvc/chrome?view=rev&revision=62339

autofill_host.h: this is an Android-only file, but it depends on
AutoFillSuggestionsReturn in render_view_host.h. Icons added in
http://src.chromium.org/viewvc/chrome?view=rev&revision=54052

autofill_manager, personal_data_manager: InfoBarDelegate added.
http://src.chromium.org/viewvc/chrome?view=rev&revision=51908

credit_card.cc: #include <string> added for card type detection.
http://src.chromium.org/viewvc/chrome?view=rev&revision=54280

web_data_service.h: #includes reorganised to reduce build time.
http://src.chromium.org/viewvc/chrome?view=rev&revision=58080

host_resolver_impl.cc: parameter added to constructor.
http://src.chromium.org/viewvc/chrome?view=rev&revision=57189

host_resolver_proc.cc: retry logic updated.
http://src.chromium.org/viewvc/chrome?view=rev&revision=58534

http_network_transaction.cc: stream initialization refactored.
http://src.chromium.org/viewvc/chrome?view=rev&revision=57342

net_resources.target.mk: generated from net.gyp, using latest version.

proxy_service.cc: ProxyConfigService for Chrome, clashes with Android.
http://src.chromium.org/viewvc/chrome?view=rev&revision=57204

Change-Id: I0e05226051d67492692bdb1a5430b2f15ce72aa0

19 files changed, 34 insertions, 236 deletions

diff --git a/app/sql/connection.cc b/app/sql/connection.cc
index 1e0aa2c..32590d3 100644
--- a/app/sql/connection.cc
+++ b/app/sql/connection.cc
@@ -11,14 +11,11 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-<<<<<<< HEAD
 #ifdef ANDROID
 #include "sqlite3.h"
 #else
-#include "third_party/sqlite/preprocessed/sqlite3.h"
-#endif
-=======
 #include "third_party/sqlite/sqlite3.h"
+#endif
 
 namespace {
 
@@ -47,7 +44,6 @@ class ScopedBusyTimeout {
 };
 
 }  // namespace
->>>>>>> Chromium at release 7.0.540.0
 
 namespace sql {
 
diff --git a/app/sql/statement.cc b/app/sql/statement.cc
index 3cff490..93553bb 100644
--- a/app/sql/statement.cc
+++ b/app/sql/statement.cc
@@ -6,15 +6,11 @@
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-<<<<<<< HEAD
 #ifdef ANDROID
 #include "sqlite3.h"
 #else
-#include "third_party/sqlite/preprocessed/sqlite3.h"
-#endif
-=======
 #include "third_party/sqlite/sqlite3.h"
->>>>>>> Chromium at release 7.0.540.0
+#endif
 
 namespace sql {
 
diff --git a/base/base_paths_posix.cc b/base/base_paths_posix.cc
index 8707c4c..8d07251 100644
--- a/base/base_paths_posix.cc
+++ b/base/base_paths_posix.cc
@@ -104,15 +104,11 @@ bool PathProviderPosix(int key, FilePath* result) {
       return false;
     }
     case base::DIR_USER_CACHE:
-<<<<<<< HEAD
 #ifdef ANDROID
       NOTREACHED();
       return false;
 #else
-      scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
-=======
       scoped_ptr<base::Environment> env(base::Environment::Create());
->>>>>>> Chromium at release 7.0.540.0
       FilePath cache_dir(base::GetXDGDirectory(env.get(), "XDG_CACHE_HOME",
                                                ".cache"));
       *result = cache_dir;
diff --git a/base/logging.cc b/base/logging.cc
index bfdff2d..f466912 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -52,12 +52,16 @@ typedef pthread_mutex_t* MutexHandle;
 #include "base/process_util.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
+#ifndef ANDROID
 #include "base/vlog.h"
+#endif
 
 namespace logging {
 
 bool g_enable_dcheck = false;
+#ifndef ANDROID
 VlogInfo* g_vlog_info = NULL;
+#endif
 
 const char* const log_severity_names[LOG_NUM_SEVERITIES] = {
   "INFO", "WARNING", "ERROR", "ERROR_REPORT", "FATAL" };
@@ -332,6 +336,9 @@ void BaseInitLoggingImpl(const PathChar* new_log_file,
                          LoggingDestination logging_dest,
                          LogLockingState lock_log,
                          OldFileDeletionState delete_old) {
+#ifdef ANDROID
+  g_enable_dcheck = false;
+#else
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   g_enable_dcheck =
       command_line->HasSwitch(switches::kEnableDCHECK);
@@ -345,21 +352,11 @@ void BaseInitLoggingImpl(const PathChar* new_log_file,
         new VlogInfo(command_line->GetSwitchValueASCII(switches::kV),
                      command_line->GetSwitchValueASCII(switches::kVModule));
   }
+#endif
 
-<<<<<<< HEAD
-void InitLogging(const PathChar* new_log_file, LoggingDestination logging_dest,
-                 LogLockingState lock_log, OldFileDeletionState delete_old) {
-  g_enable_dcheck =
-#ifdef ANDROID
-      false;
-#else
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableDCHECK);
-#endif // ANDROID
-=======
   LoggingLock::Init(lock_log, new_log_file);
 
   LoggingLock logging_lock;
->>>>>>> Chromium at release 7.0.540.0
 
   if (log_file) {
     // calling InitLogging twice or after some log call has already opened the
@@ -394,10 +391,14 @@ int GetMinLogLevel() {
 }
 
 int GetVlogLevelHelper(const char* file, size_t N) {
+#ifdef ANDROID
+  return 0;
+#else
   DCHECK_GT(N, 0U);
   return g_vlog_info ?
       g_vlog_info->GetVlogLevel(base::StringPiece(file, N - 1)) :
       VlogInfo::kDefaultVlogLevel;
+#endif
 }
 
 void SetLogFilterPrefix(const char* filter)  {
diff --git a/base/process_util.h b/base/process_util.h
index d7a36da..c513f3d 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -270,15 +270,9 @@ class ProcessFilter {
   // Returns true to indicate set-inclusion and false otherwise.  This method
   // should not have side-effects and should be idempotent.
   virtual bool Includes(const ProcessEntry& entry) const = 0;
-<<<<<<< HEAD
-#ifdef ANDROID
-  virtual ~ProcessFilter() {}
-#endif
-=======
 
  protected:
   virtual ~ProcessFilter() {}
->>>>>>> Chromium at release 7.0.540.0
 };
 
 // Returns the number of processes on the machine that are running from the
diff --git a/chrome/browser/autofill/autofill_host.h b/chrome/browser/autofill/autofill_host.h
index ea1f756..776b539 100644
--- a/chrome/browser/autofill/autofill_host.h
+++ b/chrome/browser/autofill/autofill_host.h
@@ -42,7 +42,7 @@
 class AutoFillHost {
 public:
   virtual ~AutoFillHost() { }
-  virtual void AutoFillSuggestionsReturned(int query_id, const std::vector<string16>& values, const std::vector<string16>& labels, const std::vector<int>& unique_ids) = 0;
+  virtual void AutoFillSuggestionsReturned(int query_id, const std::vector<string16>& values, const std::vector<string16>& labels, const std::vector<string16>& icons, const std::vector<int>& unique_ids) = 0;
   virtual void AutoFillFormDataFilled(int query_id, const webkit_glue::FormData& form) = 0;
 };
 
diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc
index 9d94997..cf2ce54 100644
--- a/chrome/browser/autofill/autofill_manager.cc
+++ b/chrome/browser/autofill/autofill_manager.cc
@@ -9,16 +9,11 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
-<<<<<<< HEAD
-#include "chrome/browser/autofill/autofill_dialog.h"
+#include "base/utf_string_conversions.h"
 #ifndef ANDROID
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #endif
-=======
-#include "base/utf_string_conversions.h"
-#include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
->>>>>>> Chromium at release 7.0.540.0
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/select_control_handler.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -465,24 +460,18 @@ void AutoFillManager::HandleSubmit() {
   CreditCard* credit_card;
   personal_data_->GetImportedFormData(&profile, &credit_card);
 
-<<<<<<< HEAD
-  if (credit_card) {
-#ifndef ANDROID
-    cc_infobar_.reset(new AutoFillCCInfoBarDelegate(tab_contents_, this));
-#endif
-  } else {
-=======
   if (!credit_card) {
->>>>>>> Chromium at release 7.0.540.0
     UploadFormData();
     return;
   }
 
+#ifndef ANDROID
   // Show an infobar to offer to save the credit card info.
   if (tab_contents_) {
     tab_contents_->AddInfoBar(new AutoFillCCInfoBarDelegate(tab_contents_,
                                                             this));
   }
+#endif
 }
 
 void AutoFillManager::UploadFormData() {
diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h
index 69e3523..59d41ba 100644
--- a/chrome/browser/autofill/autofill_manager.h
+++ b/chrome/browser/autofill/autofill_manager.h
@@ -213,20 +213,19 @@ class AutoFillManager :
   // The form data the user has submitted.
   scoped_ptr<FormStructure> upload_form_structure_;
 
-#ifndef ANDROID
+#ifdef ANDROID
+  // To minimize merge conflicts, we keep this pointer around, but never use it.
+  void* cc_infobar_;
+#else
   // The InfoBar that asks for permission to store credit card information.
-<<<<<<< HEAD
-  scoped_ptr<AutoFillCCInfoBarDelegate> cc_infobar_;
-#endif
-=======
   // Deletes itself when closed.
   AutoFillCCInfoBarDelegate* cc_infobar_;
+#endif
 
   friend class TestAutoFillManager;
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillCreditCardForm);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillNonBillingFormSemicolon);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillBillFormSemicolon);
->>>>>>> Chromium at release 7.0.540.0
 
   DISALLOW_COPY_AND_ASSIGN(AutoFillManager);
 };
diff --git a/chrome/browser/autofill/credit_card.cc b/chrome/browser/autofill/credit_card.cc
index 50861a3..a42fcc9 100644
--- a/chrome/browser/autofill/credit_card.cc
+++ b/chrome/browser/autofill/credit_card.cc
@@ -4,13 +4,10 @@
 
 #include "chrome/browser/autofill/credit_card.h"
 
-<<<<<<< HEAD
-#ifndef ANDROID
-// FIXME: Need l10n on Android?
-=======
 #include <string>
 
->>>>>>> Chromium at release 7.0.540.0
+#ifndef ANDROID
+// FIXME: Need l10n on Android?
 #include "app/l10n_util.h"
 #endif
 
diff --git a/chrome/browser/autofill/personal_data_manager.cc b/chrome/browser/autofill/personal_data_manager.cc
index c282bea..7dde1d2 100644
--- a/chrome/browser/autofill/personal_data_manager.cc
+++ b/chrome/browser/autofill/personal_data_manager.cc
@@ -257,18 +257,11 @@ void PersonalDataManager::SetProfiles(std::vector<AutoFillProfile>* profiles) {
                      std::mem_fun_ref(&AutoFillProfile::IsEmpty)),
       profiles->end());
 
-<<<<<<< HEAD
-  SetUniqueProfileLabels(profiles);
-
 #ifndef ANDROID
-=======
->>>>>>> Chromium at release 7.0.540.0
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!wds)
     return;
-#endif
 
-#ifndef ANDROID
   // FIXME: AutoLock does not build on Android as of the initial checkin.
   AutoLock lock(unique_ids_lock_);
 
@@ -459,6 +452,7 @@ void PersonalDataManager::AddProfile(const AutoFillProfile& profile) {
 }
 
 void PersonalDataManager::UpdateProfile(const AutoFillProfile& profile) {
+#ifndef ANDROID
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!wds)
     return;
@@ -475,6 +469,7 @@ void PersonalDataManager::UpdateProfile(const AutoFillProfile& profile) {
 
   wds->UpdateAutoFillProfile(profile);
   FOR_EACH_OBSERVER(Observer, observers_, OnPersonalDataChanged());
+#endif
 }
 
 void PersonalDataManager::RemoveProfile(int unique_id) {
@@ -505,6 +500,7 @@ void PersonalDataManager::AddCreditCard(const CreditCard& credit_card) {
 }
 
 void PersonalDataManager::UpdateCreditCard(const CreditCard& credit_card) {
+#ifndef ANDROID
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!wds)
     return;
@@ -521,6 +517,7 @@ void PersonalDataManager::UpdateCreditCard(const CreditCard& credit_card) {
 
   wds->UpdateCreditCard(credit_card);
   FOR_EACH_OBSERVER(Observer, observers_, OnPersonalDataChanged());
+#endif
 }
 
 void PersonalDataManager::RemoveCreditCard(int unique_id) {
@@ -796,48 +793,8 @@ void PersonalDataManager::SaveImportedProfile() {
   if (!imported_profile_.get())
     return;
 
-<<<<<<< HEAD
-  // Set to true if |imported_profile_| is merged into the profile list.
-  bool merged = false;
-
-  imported_profile_->set_label(ASCIIToUTF16(kUnlabeled));
-
-  // Don't save a web profile if the data in the profile is a subset of an
-  // auxiliary profile.
-  for (std::vector<AutoFillProfile*>::const_iterator iter =
-           auxiliary_profiles_.begin();
-       iter != auxiliary_profiles_.end(); ++iter) {
-    if (imported_profile_->IsSubsetOf(**iter))
-      return;
-  }
-
-  std::vector<AutoFillProfile> profiles;
-  for (std::vector<AutoFillProfile*>::const_iterator iter =
-           web_profiles_.begin();
-       iter != web_profiles_.end(); ++iter) {
-    if (imported_profile_->IsSubsetOf(**iter)) {
-      // In this case, the existing profile already contains all of the data
-      // in |imported_profile_|, so consider the profiles already merged.
-      merged = true;
-    } else if ((*iter)->IntersectionOfTypesHasEqualValues(
-        *imported_profile_)) {
-      // |imported_profile| contains all of the data in this profile, plus
-      // more.
-      merged = true;
-      (*iter)->MergeWith(*imported_profile_);
-    }
-
-    profiles.push_back(**iter);
-  }
-
-  if (!merged)
-    profiles.push_back(*imported_profile_);
-
-  SetProfiles(&profiles);
-#endif
-=======
   AddProfile(*imported_profile_);
->>>>>>> Chromium at release 7.0.540.0
+#endif
 }
 
 // TODO(jhawkins): Refactor and merge this with SaveImportedProfile.
diff --git a/chrome/browser/spellcheck_host_observer.h b/chrome/browser/spellcheck_host_observer.h
index 91d135a..7ce720f 100644
--- a/chrome/browser/spellcheck_host_observer.h
+++ b/chrome/browser/spellcheck_host_observer.h
@@ -11,16 +11,9 @@ class SpellCheckHostObserver {
  public:
   // Invoked on the UI thread when SpellCheckHost is initialized.
   virtual void SpellCheckHostInitialized() = 0;
-<<<<<<< HEAD
-#ifdef ANDROID
-  // TODO: Upstream
-  virtual ~SpellCheckHostObserver() { }
-#endif
-=======
 
  protected:
   virtual ~SpellCheckHostObserver() {}
->>>>>>> Chromium at release 7.0.540.0
 };
 
 #endif  // CHROME_BROWSER_SPELLCHECK_HOST_OBSERVER_H_
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index c140951..75dbcd2 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -14,15 +14,11 @@
 #include "base/lock.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/chrome_thread.h"
-<<<<<<< HEAD
-#include "chrome/browser/search_engines/template_url.h"
+#include "chrome/browser/search_engines/template_url_id.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #ifdef ANDROID
 #include <WebCoreSupport/autofill/FormFieldAndroid.h>
 #else
-=======
-#include "chrome/browser/search_engines/template_url_id.h"
->>>>>>> Chromium at release 7.0.540.0
 #include "webkit/glue/form_field.h"
 #endif
 
diff --git a/chrome/common/net/url_fetcher.h b/chrome/common/net/url_fetcher.h
index fbdd36f..08b5335 100644
--- a/chrome/common/net/url_fetcher.h
+++ b/chrome/common/net/url_fetcher.h
@@ -74,17 +74,9 @@ class URLFetcher {
                                     int response_code,
                                     const ResponseCookies& cookies,
                                     const std::string& data) = 0;
-<<<<<<< HEAD
-#ifdef ANDROID
-    // TODO: Upstream.
-    virtual
-#endif
-    ~Delegate() { }
-=======
 
    protected:
     virtual ~Delegate() {}
->>>>>>> Chromium at release 7.0.540.0
   };
 
   // URLFetcher::Create uses the currently registered Factory to create the
@@ -95,17 +87,9 @@ class URLFetcher {
                                          const GURL& url,
                                          RequestType request_type,
                                          Delegate* d) = 0;
-<<<<<<< HEAD
-#ifdef ANDROID
-    // TODO: Upstream
-    virtual
-#endif
-    ~Factory() { }
-=======
 
    protected:
     virtual ~Factory() {}
->>>>>>> Chromium at release 7.0.540.0
   };
 
   // |url| is the URL to send the request to.
@@ -160,29 +144,21 @@ class URLFetcher {
 
   // Set the URLRequestContext on the request.  Must be called before the
   // request is started.
-<<<<<<< HEAD
 #ifdef ANDROID
   // TODO: Upstream.
   virtual
 #endif
-  void set_request_context(URLRequestContextGetter* request_context_getter);
-=======
   void set_request_context(
       URLRequestContextGetter* request_context_getter);
->>>>>>> Chromium at release 7.0.540.0
 
   // If |retry| is false, 5xx responses will be propagated to the observer,
   // if it is true URLFetcher will automatically re-execute the request,
   // after backoff_delay() elapses. URLFetcher has it set to true by default.
-<<<<<<< HEAD
 #ifdef ANDROID
   // TODO: Upstream.
   virtual
 #endif
-  void set_automatcally_retry_on_5xx(bool retry);
-=======
   void set_automatically_retry_on_5xx(bool retry);
->>>>>>> Chromium at release 7.0.540.0
 
   // Returns the back-off delay before the request will be retried,
   // when a 5xx response was received.
diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc
index 51125e8..a6ecc41 100644
--- a/net/base/host_resolver_impl.cc
+++ b/net/base/host_resolver_impl.cc
@@ -77,12 +77,8 @@ HostResolver* CreateSystemHostResolver(size_t max_concurrent_resolves,
 #else
   HostResolverImpl* resolver =
       new HostResolverImpl(NULL, CreateDefaultCache(),
-<<<<<<< HEAD
-                           max_concurrent_resolves);
-#endif
-=======
                            max_concurrent_resolves, net_log);
->>>>>>> Chromium at release 7.0.540.0
+#endif
 
   return systemResolver;
 }
diff --git a/net/base/host_resolver_proc.cc b/net/base/host_resolver_proc.cc
index 009a636..c669aab 100644
--- a/net/base/host_resolver_proc.cc
+++ b/net/base/host_resolver_proc.cc
@@ -199,13 +199,8 @@ int SystemHostResolverProc(const std::string& host,
   hints.ai_socktype = SOCK_STREAM;
 
   int err = getaddrinfo(host.c_str(), NULL, &hints, &ai);
-<<<<<<< HEAD
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && !defined(ANDROID)
-  net::DnsReloadTimer* dns_timer = Singleton<net::DnsReloadTimer>::get();
-=======
   bool should_retry = false;
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
->>>>>>> Chromium at release 7.0.540.0
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && !defined(ANDROID)
   // If we fail, re-initialise the resolver just in case there have been any
   // changes to /etc/resolv.conf and retry. See http://crbug.com/11380 for info.
   if (err && DnsReloadTimerHasExpired()) {
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 0f0a7ea..3291710 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -1149,76 +1149,7 @@ void HttpNetworkTransaction::ResetConnectionAndRequestForResend() {
   // headers, but we may need to resend the CONNECT request first to recreate
   // the SSL tunnel.
   request_headers_.clear();
-<<<<<<< HEAD
-  next_state_ = STATE_INIT_CONNECTION;  // Resend the request.
-}
-
-int HttpNetworkTransaction::ReconsiderProxyAfterError(int error) {
-#ifdef ANDROID
-  // Android crashes :(
-  return error;
-#endif
-  DCHECK(!pac_request_);
-
-  // A failure to resolve the hostname or any error related to establishing a
-  // TCP connection could be grounds for trying a new proxy configuration.
-  //
-  // Why do this when a hostname cannot be resolved?  Some URLs only make sense
-  // to proxy servers.  The hostname in those URLs might fail to resolve if we
-  // are still using a non-proxy config.  We need to check if a proxy config
-  // now exists that corresponds to a proxy server that could load the URL.
-  //
-  switch (error) {
-    case ERR_NAME_NOT_RESOLVED:
-    case ERR_INTERNET_DISCONNECTED:
-    case ERR_ADDRESS_UNREACHABLE:
-    case ERR_CONNECTION_CLOSED:
-    case ERR_CONNECTION_RESET:
-    case ERR_CONNECTION_REFUSED:
-    case ERR_CONNECTION_ABORTED:
-    case ERR_TIMED_OUT:
-    case ERR_TUNNEL_CONNECTION_FAILED:
-    case ERR_SOCKS_CONNECTION_FAILED:
-      break;
-    case ERR_SOCKS_CONNECTION_HOST_UNREACHABLE:
-      // Remap the SOCKS-specific "host unreachable" error to a more
-      // generic error code (this way consumers like the link doctor
-      // know to substitute their error page).
-      //
-      // Note that if the host resolving was done by the SOCSK5 proxy, we can't
-      // differentiate between a proxy-side "host not found" versus a proxy-side
-      // "address unreachable" error, and will report both of these failures as
-      // ERR_ADDRESS_UNREACHABLE.
-      return ERR_ADDRESS_UNREACHABLE;
-    default:
-      return error;
-  }
-
-  if (request_->load_flags & LOAD_BYPASS_PROXY) {
-    return error;
-  }
-
-  int rv = session_->proxy_service()->ReconsiderProxyAfterError(
-      request_->url, &proxy_info_, &io_callback_, &pac_request_, net_log_);
-  if (rv == OK || rv == ERR_IO_PENDING) {
-    // If the error was during connection setup, there is no socket to
-    // disconnect.
-    if (connection_->socket())
-      connection_->socket()->Disconnect();
-    connection_->Reset();
-    next_state_ = STATE_RESOLVE_PROXY_COMPLETE;
-  } else {
-    // If ReconsiderProxyAfterError() failed synchronously, it means
-    // there was nothing left to fall-back to, so fail the transaction
-    // with the last connection error we got.
-    // TODO(eroman): This is a confusing contract, make it more obvious.
-    rv = error;
-  }
-
-  return rv;
-=======
   next_state_ = STATE_CREATE_STREAM;  // Resend the request.
->>>>>>> Chromium at release 7.0.540.0
 }
 
 bool HttpNetworkTransaction::ShouldApplyProxyAuth() const {
diff --git a/net/net_resources.target.mk b/net/net_resources.target.mk
index ca44ac2..cb1ba10 100644
--- a/net/net_resources.target.mk
+++ b/net/net_resources.target.mk
@@ -8,11 +8,7 @@ $(obj)/gen/net/grit/net_resources.h: obj := $(abs_obj)
 $(obj)/gen/net/grit/net_resources.h: builddir := $(abs_builddir)
 
 $(obj)/gen/net/grit/net_resources.h: TOOLSET := $(TOOLSET)
-<<<<<<< HEAD
-$(obj)/gen/net/grit/net_resources.h: net/base/net_resources.grd net/base/dir_header.html net/base/net_resources.grd tools/grit/grit.py tools/grit/grit_info.py tools/grit/resource_ids tools/grit/grit/exception.py tools/grit/grit/tclib.py tools/grit/grit/pseudo_unittest.py tools/grit/grit/grd_reader_unittest.py tools/grit/grit/grd_reader.py tools/grit/grit/scons.py tools/grit/grit/clique_unittest.py tools/grit/grit/constants.py tools/grit/grit/grit_runner.py tools/grit/grit/clique.py tools/grit/grit/grit_runner_unittest.py tools/grit/grit/shortcuts.py tools/grit/grit/util_unittest.py tools/grit/grit/__init__.py tools/grit/grit/tclib_unittest.py tools/grit/grit/xtb_reader_unittest.py tools/grit/grit/xtb_reader.py tools/grit/grit/pseudo.py tools/grit/grit/test_suite_all.py tools/grit/grit/util.py tools/grit/grit/shortcuts_unittests.py tools/grit/grit/extern/tclib.py tools/grit/grit/extern/FP.py tools/grit/grit/extern/__init__.py tools/grit/grit/node/structure.py tools/grit/grit/node/io_unittest.py tools/grit/grit/node/message.py tools/grit/grit/node/structure_unittest.py tools/grit/grit/node/base.py tools/grit/grit/node/empty.py tools/grit/grit/node/misc.py tools/grit/grit/node/__init__.py tools/grit/grit/node/include.py tools/grit/grit/node/mapping.py tools/grit/grit/node/message_unittest.py tools/grit/grit/node/io.py tools/grit/grit/node/variant.py tools/grit/grit/node/base_unittest.py tools/grit/grit/node/misc_unittest.py tools/grit/grit/node/custom/filename_unittest.py tools/grit/grit/node/custom/filename.py tools/grit/grit/node/custom/__init__.py tools/grit/grit/tool/newgrd.py tools/grit/grit/tool/transl2tc.py tools/grit/grit/tool/postprocess_interface.py tools/grit/grit/tool/preprocess_unittest.py tools/grit/grit/tool/test.py tools/grit/grit/tool/count.py tools/grit/grit/tool/toolbar_preprocess.py tools/grit/grit/tool/toolbar_postprocess.py tools/grit/grit/tool/resize.py tools/grit/grit/tool/unit.py tools/grit/grit/tool/preprocess_interface.py tools/grit/grit/tool/menu_from_parts.py tools/grit/grit/tool/__init__.py tools/grit/grit/tool/rc2grd_unittest.py tools/grit/grit/tool/interface.py tools/grit/grit/tool/postprocess_unittest.py tools/grit/grit/tool/diff_structures.py tools/grit/grit/tool/transl2tc_unittest.py tools/grit/grit/tool/rc2grd.py tools/grit/grit/tool/build.py tools/grit/grit/gather/admin_template.py tools/grit/grit/gather/muppet_strings_unittest.py tools/grit/grit/gather/rc_unittest.py tools/grit/grit/gather/tr_html.py tools/grit/grit/gather/regexp.py tools/grit/grit/gather/__init__.py tools/grit/grit/gather/admin_template_unittest.py tools/grit/grit/gather/interface.py tools/grit/grit/gather/muppet_strings.py tools/grit/grit/gather/rc.py tools/grit/grit/gather/txt_unittest.py tools/grit/grit/gather/tr_html_unittest.py tools/grit/grit/gather/txt.py tools/grit/grit/format/rc_header_unittest.py tools/grit/grit/format/data_pack.py tools/grit/grit/format/data_pack_unittest.py tools/grit/grit/format/rc_unittest.py tools/grit/grit/format/js_map_format.py tools/grit/grit/format/resource_map.py tools/grit/grit/format/rc_header.py tools/grit/grit/format/__init__.py tools/grit/grit/format/html_inline.py tools/grit/grit/format/interface.py tools/grit/grit/format/rc.py tools/grit/grit/format/js_map_format_unittest.py FORCE_DO_CMD
-=======
 $(obj)/gen/net/grit/net_resources.h: net/base/net_resources.grd net/base/dir_header.html net/base/net_resources.grd tools/grit/grit_info.py tools/grit/resource_ids tools/grit/grit.py tools/grit/grit/exception.py tools/grit/grit/shortcuts_unittests.py tools/grit/grit/test_suite_all.py tools/grit/grit/tclib.py tools/grit/grit/util_unittest.py tools/grit/grit/pseudo_unittest.py tools/grit/grit/grd_reader.py tools/grit/grit/clique.py tools/grit/grit/xtb_reader_unittest.py tools/grit/grit/grit_runner.py tools/grit/grit/tclib_unittest.py tools/grit/grit/util.py tools/grit/grit/pseudo.py tools/grit/grit/shortcuts.py tools/grit/grit/clique_unittest.py tools/grit/grit/xtb_reader.py tools/grit/grit/__init__.py tools/grit/grit/scons.py tools/grit/grit/constants.py tools/grit/grit/grd_reader_unittest.py tools/grit/grit/grit_runner_unittest.py tools/grit/grit/format/html_inline.py tools/grit/grit/format/rc_unittest.py tools/grit/grit/format/rc_header.py tools/grit/grit/format/interface.py tools/grit/grit/format/data_pack_unittest.py tools/grit/grit/format/__init__.py tools/grit/grit/format/rc_header_unittest.py tools/grit/grit/format/js_map_format.py tools/grit/grit/format/data_pack.py tools/grit/grit/format/rc.py tools/grit/grit/format/resource_map.py tools/grit/grit/format/js_map_format_unittest.py tools/grit/grit/format/policy_templates/policy_template_generator.py tools/grit/grit/format/policy_templates/template_formatter.py tools/grit/grit/format/policy_templates/policy_template_generator_unittest.py tools/grit/grit/format/policy_templates/writer_configuration.py tools/grit/grit/format/policy_templates/__init__.py tools/grit/grit/format/policy_templates/writers/adm_writer.py tools/grit/grit/format/policy_templates/writers/xml_writer_base_unittest.py tools/grit/grit/format/policy_templates/writers/plist_strings_writer.py tools/grit/grit/format/policy_templates/writers/adml_writer_unittest.py tools/grit/grit/format/policy_templates/writers/plist_writer.py tools/grit/grit/format/policy_templates/writers/writer_unittest_common.py tools/grit/grit/format/policy_templates/writers/admx_writer_unittest.py tools/grit/grit/format/policy_templates/writers/plist_strings_writer_unittest.py tools/grit/grit/format/policy_templates/writers/doc_writer.py tools/grit/grit/format/policy_templates/writers/doc_writer_unittest.py tools/grit/grit/format/policy_templates/writers/__init__.py tools/grit/grit/format/policy_templates/writers/adm_writer_unittest.py tools/grit/grit/format/policy_templates/writers/plist_writer_unittest.py tools/grit/grit/format/policy_templates/writers/adml_writer.py tools/grit/grit/format/policy_templates/writers/xml_formatted_writer.py tools/grit/grit/format/policy_templates/writers/mock_writer.py tools/grit/grit/format/policy_templates/writers/template_writer.py tools/grit/grit/format/policy_templates/writers/admx_writer.py tools/grit/grit/gather/tr_html.py tools/grit/grit/gather/rc_unittest.py tools/grit/grit/gather/tr_html_unittest.py tools/grit/grit/gather/txt_unittest.py tools/grit/grit/gather/muppet_strings_unittest.py tools/grit/grit/gather/regexp.py tools/grit/grit/gather/interface.py tools/grit/grit/gather/muppet_strings.py tools/grit/grit/gather/__init__.py tools/grit/grit/gather/json_loader.py tools/grit/grit/gather/admin_template.py tools/grit/grit/gather/txt.py tools/grit/grit/gather/rc.py tools/grit/grit/gather/admin_template_unittest.py tools/grit/grit/tool/diff_structures.py tools/grit/grit/tool/toolbar_preprocess.py tools/grit/grit/tool/rc2grd.py tools/grit/grit/tool/rc2grd_unittest.py tools/grit/grit/tool/test.py tools/grit/grit/tool/postprocess_interface.py tools/grit/grit/tool/unit.py tools/grit/grit/tool/transl2tc.py tools/grit/grit/tool/resize.py tools/grit/grit/tool/interface.py tools/grit/grit/tool/preprocess_unittest.py tools/grit/grit/tool/__init__.py tools/grit/grit/tool/newgrd.py tools/grit/grit/tool/build.py tools/grit/grit/tool/preprocess_interface.py tools/grit/grit/tool/count.py tools/grit/grit/tool/postprocess_unittest.py tools/grit/grit/tool/menu_from_parts.py tools/grit/grit/tool/toolbar_postprocess.py tools/grit/grit/tool/transl2tc_unittest.py tools/grit/grit/extern/tclib.py tools/grit/grit/extern/__init__.py tools/grit/grit/extern/FP.py tools/grit/grit/node/structure.py tools/grit/grit/node/variant.py tools/grit/grit/node/include.py tools/grit/grit/node/io_unittest.py tools/grit/grit/node/base.py tools/grit/grit/node/misc_unittest.py tools/grit/grit/node/base_unittest.py tools/grit/grit/node/message.py tools/grit/grit/node/__init__.py tools/grit/grit/node/mapping.py tools/grit/grit/node/io.py tools/grit/grit/node/message_unittest.py tools/grit/grit/node/structure_unittest.py tools/grit/grit/node/misc.py tools/grit/grit/node/empty.py tools/grit/grit/node/custom/filename.py tools/grit/grit/node/custom/filename_unittest.py tools/grit/grit/node/custom/__init__.py FORCE_DO_CMD
->>>>>>> Chromium at release 7.0.540.0
 	$(call do_cmd,net_resources_grit_0)
 $(obj)/gen/net/net_resources.pak $(obj)/gen/net/net_resources.rc: $(obj)/gen/net/grit/net_resources.h
 $(obj)/gen/net/net_resources.pak $(obj)/gen/net/net_resources.rc: ;
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 67c64dd..c4226ff 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -743,17 +743,12 @@ ProxyConfigService* ProxyService::CreateSystemProxyConfigService(
 #if defined(OS_WIN)
   return new ProxyConfigServiceWin();
 #elif defined(OS_MACOSX)
-<<<<<<< HEAD
-  return new ProxyConfigServiceMac();
-#elif defined(OS_LINUX) && !defined(ANDROID)
-=======
   return new ProxyConfigServiceMac(io_loop);
 #elif defined(OS_CHROMEOS)
   NOTREACHED() << "ProxyConfigService for ChromeOS should be created in "
                << "chrome_url_request_context.cc::CreateProxyConfigService.";
   return NULL;
-#elif defined(OS_LINUX)
->>>>>>> Chromium at release 7.0.540.0
+#elif defined(OS_LINUX) && !defined(ANDROID)
   ProxyConfigServiceLinux* linux_config_service
       = new ProxyConfigServiceLinux();
 
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 7282edc..31b732e 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -531,13 +531,8 @@ class URLRequest : public NonThreadSafe {
   // Returns the priority level for this request.
   net::RequestPriority priority() const { return priority_; }
   void set_priority(net::RequestPriority priority) {
-<<<<<<< HEAD
-    //DCHECK_GE(priority, net::HIGHEST);
-    //DCHECK_LE(priority, net::LOWEST);
-=======
     DCHECK_GE(priority, net::HIGHEST);
     DCHECK_LT(priority, net::NUM_PRIORITIES);
->>>>>>> Chromium at release 7.0.540.0
     priority_ = priority;
   }