[Sheriff] Revert "Revert "Revert 266297 "1. Handle the case of empty embedder_extension_id..."""

chrome/browser/extensions/api/webview/webview_api.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_WEBVIEW_WEBVIEW_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_WEBVIEW_WEBVIEW_API_H_
 
 #include "chrome/browser/extensions/api/capture_web_contents_function.h"
 #include "chrome/browser/extensions/api/execute_code_function.h"
-#include "chrome/browser/guest_view/web_view/web_view_find_helper.h"
-#include "chrome/browser/guest_view/web_view/web_view_guest.h"
+#include "chrome/browser/guestview/webview/webview_find_helper.h"
+#include "chrome/browser/guestview/webview/webview_guest.h"
 
 // WARNING: Webview could be loaded in an unblessed context, thus any new
 // APIs must extend WebviewExtensionFunction/WebviewExecuteCodeFunction which
 // do a process ID check to prevent abuse by normal renderer processes.
 // TODO(guohui): refactor WebviewExecuteCodeFunction to also extend
 // WebviewExtensionFunction.
 namespace extensions {
 
 // An abstract base class for async webview APIs. It does a process ID check
 // in RunImpl, and then calls RunImplSafe which must be overriden by all
@@ skipping 340 matching lines @@
  private:
   // WebviewExtensionFunction implementation.
   virtual bool RunImplSafe(WebViewGuest* guest) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(WebviewTerminateFunction);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_WEBVIEW_WEBVIEW_API_H_