Refactor GuestView.

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 820 matching lines @@
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   if (!service) {
     NOTREACHED();
     return;
   }
 
   /// TODO(fsamuel): In the future, certain types of GuestViews won't require
   // extension bindings. At that point, we should clear |extension_id| instead
   // of exiting early.
-  if (!service->GetExtensionById(extension_id, false) &&
+  if (!extension_id.empty() &&
+      !service->GetExtensionById(extension_id, false) &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserPluginForAllViewTypes)) {
     NOTREACHED();
     return;
   }
 
   if (opener_web_contents) {
     GuestView* guest = GuestView::FromWebContents(opener_web_contents);
     if (!guest) {
       NOTREACHED();
@@ skipping 1874 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome