Fixes in CrNet and Cronet frameworks

ios/crnet/crnet_environment.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ios/crnet/crnet_environment.h"
 
 #import <Foundation/Foundation.h>
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/atomicops.h"
 #include "base/command_line.h"
+#include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/i18n/icu_util.h"
 #include "base/json/json_writer.h"
 #include "base/mac/bind_objc_block.h"
+#include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_block.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/worker_pool.h"
 #include "components/prefs/json_pref_store.h"
 #include "components/prefs/pref_filter.h"
@@ skipping 115 matching lines @@
     const base::Closure& task) {
   file_user_blocking_thread_->message_loop()->PostTask(from_here, task);
 }
 
 // static
 void CrNetEnvironment::Initialize() {
   DCHECK_EQ([NSThread currentThread], [NSThread mainThread]);
   if (!g_at_exit_)
     g_at_exit_ = new base::AtExitManager;
 
+  // Change the framework bundle to the bundle that contain CrNet framework.
+  // By default the framework bundle is set equal to the main (app) bundle.
+  NSBundle* frameworkBundle = [NSBundle bundleForClass:CrNet.class];
+  base::mac::SetOverrideFrameworkBundle(frameworkBundle);
 #if !BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)
   CHECK(base::i18n::InitializeICU());
 #endif
   url::Initialize();
   base::CommandLine::Init(0, nullptr);
 
   // Without doing this, StatisticsRecorder::FactoryGet() leaks one histogram
   // per call after the first for a given name.
   base::StatisticsRecorder::Initialize();
 
@@ skipping 180 matching lines @@
     net_pref_store_->ReadPrefsAsync(nullptr);
     sdch_owner_->EnablePersistentStorage(
         std::unique_ptr<net::SdchOwner::PrefStorage>(
             new SdchOwnerPrefStorage(net_pref_store_.get())));
   }
   context->set_sdch_manager(sdch_manager_.get());
 }
 
 void CrNetEnvironment::InitializeOnNetworkThread() {
   DCHECK(network_io_thread_->task_runner()->BelongsToCurrentThread());
+  base::FeatureList::InitializeInstance(std::string(), std::string());
 
   ConfigureSdchOnNetworkThread();
 
+  // Use the framework bundle to search for resources.
+  NSBundle* frameworkBundle = base::mac::FrameworkBundle();
   NSString* bundlePath =
-      [[NSBundle mainBundle] pathForResource:@"crnet_resources"
-                                      ofType:@"bundle"];
+      [frameworkBundle pathForResource:@"crnet_resources" ofType:@"bundle"];
   NSBundle* bundle = [NSBundle bundleWithPath:bundlePath];
   NSString* acceptableLanguages = NSLocalizedStringWithDefaultValue(
       @"IDS_ACCEPT_LANGUAGES",
       @"Localizable",
       bundle,
       @"en-US,en",
       @"These values are copied from Chrome's .xtb files, so the same "
        "values are used in the |Accept-Language| header. Key name matches "
        "Chrome's.");
   if (acceptableLanguages == Nil)
@@ skipping 44 matching lines @@
   cache_path = cache_path.Append(FILE_PATH_LITERAL("crnet"));
   std::unique_ptr<net::HttpCache::DefaultBackend> main_backend(
       new net::HttpCache::DefaultBackend(net::DISK_CACHE,
                                          net::CACHE_BACKEND_DEFAULT, cache_path,
                                          0,  // Default cache size.
                                          network_cache_thread_->task_runner()));
 
   net::HttpNetworkSession::Params params;
   params.host_resolver = main_context_->host_resolver();
   params.cert_verifier = main_context_->cert_verifier();
+  params.cert_transparency_verifier =
+      main_context_->cert_transparency_verifier();
+  params.ct_policy_enforcer = main_context_->ct_policy_enforcer();
   params.channel_id_service = main_context_->channel_id_service();
   params.transport_security_state = main_context_->transport_security_state();
   params.proxy_service = main_context_->proxy_service();
   params.ssl_config_service = main_context_->ssl_config_service();
   params.http_auth_handler_factory = main_context_->http_auth_handler_factory();
   params.http_server_properties = main_context_->http_server_properties();
   params.net_log = main_context_->net_log();
   params.enable_http2 = spdy_enabled();
   params.enable_quic = quic_enabled();
 
@@ skipping 44 matching lines @@
 
   return user_agent_settings->GetUserAgent();
 }
 
 void CrNetEnvironment::ClearCache(ClearCacheCallback callback) {
   PostToNetworkThread(
       FROM_HERE,
       base::Bind(&net::ClearHttpCache, main_context_getter_,
                  network_io_thread_->task_runner(), base::BindBlock(callback)));
 }