Upstreaming SpdyProxy-related switches, OTR logic, and histograms

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 828 matching lines @@
       switches::kPlaybackMode,
       switches::kPpapiFlashArgs,
       switches::kPpapiFlashInProcess,
       switches::kPpapiFlashPath,
       switches::kPpapiFlashVersion,
       switches::kProfilingAtStart,
       switches::kProfilingFile,
       switches::kProfilingFlush,
       switches::kRecordMode,
       switches::kSilentDumpOnDCHECK,
+#if defined(OS_ANDROID)
+      switches::kSpdyProxyOrigin,
+#endif
       switches::kWhitelistedExtensionID,
     };
 
     command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
                                    arraysize(kSwitchNames));
   } else if (process_type == switches::kUtilityProcess) {
     static const char* const kSwitchNames[] = {
       switches::kAllowHTTPBackgroundPage,
       switches::kEnableExperimentalExtensionApis,
+#if defined(OS_ANDROID)
+      switches::kSpdyProxyOrigin,
+#endif
       switches::kWhitelistedExtensionID,
     };
 
     command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
                                    arraysize(kSwitchNames));
   } else if (process_type == switches::kPluginProcess) {
     static const char* const kSwitchNames[] = {
   #if defined(OS_CHROMEOS)
       switches::kLoginProfile,
   #endif
@@ skipping 846 matching lines @@
     partition_id = extension->id();
   }
 
   // Enforce that IsValidStoragePartitionId() implementation stays in sync.
   DCHECK(IsValidStoragePartitionId(browser_context, partition_id));
   return partition_id;
 }
 
 
 }  // namespace chrome