Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1.

chrome/browser/extensions/chrome_extensions_browser_client.cc

 // Copyright 2013 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/extensions/chrome_extensions_browser_client.h"
 
 #include "base/command_line.h"
 #include "base/version.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/chrome_app_sorting.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
+#include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/pref_names.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/browser/pref_names.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #endif
 
 namespace extensions {
 
-ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {}
+ChromeExtensionsBrowserClient::ChromeExtensionsBrowserClient() {
+  // Only set if it hasn't already been set (e.g. by a test).
+  if (GetCurrentChannel() == GetDefaultChannel())
+    SetCurrentChannel(chrome::VersionInfo::GetChannel());
+}
 
 ChromeExtensionsBrowserClient::~ChromeExtensionsBrowserClient() {}
 
 bool ChromeExtensionsBrowserClient::IsShuttingDown() {
   return g_browser_process->IsShuttingDown();
 }
 
 bool ChromeExtensionsBrowserClient::AreExtensionsDisabled(
     const CommandLine& command_line,
     content::BrowserContext* context) {
@@ skipping 127 matching lines @@
   dependencies.push_back(ExtensionSystemSharedFactory::GetInstance());
   return dependencies;
 }
 
 ExtensionSystem* ChromeExtensionsBrowserClient::CreateExtensionSystem(
     content::BrowserContext* context) {
   return new ExtensionSystemImpl(static_cast<Profile*>(context));
 }
 
 }  // namespace extensions