Properly propagate the current Chrome channel into the Feature system on the

chrome/renderer/extensions/dispatcher.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/renderer/extensions/dispatcher.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
@@ skipping 201 matching lines @@
     return v8::Integer::New(manifest_version_);
   }
 
  private:
   std::string extension_id_;
   std::string context_type_;
   bool is_incognito_context_;
   int manifest_version_;
 };
 
-class ChannelNativeHandler : public NativeHandler {
- public:
-  explicit ChannelNativeHandler(chrome::VersionInfo::Channel channel)
-      : channel_(channel) {
-    RouteFunction("IsDevChannel",
-        base::Bind(&ChannelNativeHandler::IsDevChannel,
-                   base::Unretained(this)));
-  }
-
-  v8::Handle<v8::Value> IsDevChannel(const v8::Arguments& args) {
-    return v8::Boolean::New(channel_ <= chrome::VersionInfo::CHANNEL_DEV);
-  }
-
-  chrome::VersionInfo::Channel channel_;
-};
-
 class LoggingNativeHandler : public NativeHandler {
  public:
   LoggingNativeHandler() {
     RouteFunction("DCHECK",
         base::Bind(&LoggingNativeHandler::Dcheck,
                    base::Unretained(this)));
   }
 
   v8::Handle<v8::Value> Dcheck(const v8::Arguments& args) {
     CHECK_LE(args.Length(), 2);
@@ skipping 48 matching lines @@
   return chrome->ToObject();
 }
 
 }  // namespace
 
 Dispatcher::Dispatcher()
     : is_webkit_initialized_(false),
       webrequest_adblock_(false),
       webrequest_adblock_plus_(false),
       webrequest_other_(false),
-      source_map_(&ResourceBundle::GetSharedInstance()),
-      chrome_channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {
+      source_map_(&ResourceBundle::GetSharedInstance()) {
   const CommandLine& command_line = *(CommandLine::ForCurrentProcess());
   is_extension_process_ =
       command_line.HasSwitch(switches::kExtensionProcess) ||
       command_line.HasSwitch(switches::kSingleProcess);
 
   if (is_extension_process_) {
     RenderThread::Get()->SetIdleNotificationDelayInMs(
         kInitialExtensionIdleHandlerDelayMs);
   }
 
@@ skipping 73 matching lines @@
 }
 
 void Dispatcher::OnSetFunctionNames(
     const std::vector<std::string>& names) {
   function_names_.clear();
   for (size_t i = 0; i < names.size(); ++i)
     function_names_.insert(names[i]);
 }
 
 void Dispatcher::OnSetChannel(int channel) {
-  chrome_channel_ = channel;
+  extensions::Feature::SetCurrentChannel(
+      static_cast<chrome::VersionInfo::Channel>(channel));
 }
 
 void Dispatcher::OnMessageInvoke(const std::string& extension_id,
                                  const std::string& function_name,
                                  const ListValue& args,
                                  const GURL& event_url,
                                  bool user_gesture) {
   scoped_ptr<WebScopedUserGesture> web_user_gesture;
   if (user_gesture) {
     web_user_gesture.reset(new WebScopedUserGesture);
@@ skipping 336 matching lines @@
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system.get());
 
   RegisterNativeHandlers(module_system.get(), context);
 
   module_system->RegisterNativeHandler("chrome_hidden",
       scoped_ptr<NativeHandler>(new ChromeHiddenNativeHandler()));
   module_system->RegisterNativeHandler("print",
       scoped_ptr<NativeHandler>(new PrintNativeHandler()));
   module_system->RegisterNativeHandler("lazy_background_page",
       scoped_ptr<NativeHandler>(new LazyBackgroundPageNativeHandler(this)));
-  module_system->RegisterNativeHandler("channel",
-      scoped_ptr<NativeHandler>(new ChannelNativeHandler(
-          static_cast<chrome::VersionInfo::Channel>(chrome_channel_))));
   module_system->RegisterNativeHandler("logging",
       scoped_ptr<NativeHandler>(new LoggingNativeHandler()));
 
-
   int manifest_version = extension ? extension->manifest_version() : 1;
   module_system->RegisterNativeHandler("process",
       scoped_ptr<NativeHandler>(new ProcessInfoNativeHandler(
           this, context->GetExtensionID(),
           context->GetContextTypeDescription(),
           ChromeRenderProcessObserver::is_incognito_process(),
           manifest_version)));
 
   GetOrCreateChrome(v8_context);
 
@@ skipping 353 matching lines @@
   // we should abort.
   WebKit::WebFrame* frame = context->web_frame();
   ExtensionURLInfo url_info(frame->document().securityOrigin(),
       UserScriptSlave::GetDataSourceURLForFrame(frame));
   CHECK(!extensions_.IsSandboxedPage(url_info));
 
   return true;
 }
 
 }  // namespace extensions