From 583dca288638e576176ea67e040b0f9e2d160703 Mon Sep 17 00:00:00 2001
From: "brettw@chromium.org"
 <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 17 Dec 2010 01:12:05 +0000
Subject: [PATCH] Remove CrOS hack from ppapi.gyp that made the include
 directories work. This fixes the includes for cros to use "third_party" so
 that everything works.

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/5854003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69493 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/DEPS                                           | 2 +-
 chrome/browser/chromeos/cros/brightness_library.h             | 2 +-
 chrome/browser/chromeos/cros/burn_library.h                   | 3 +--
 chrome/browser/chromeos/cros/cros_library_loader.cc           | 2 +-
 chrome/browser/chromeos/cros/cros_mock.h                      | 2 +-
 chrome/browser/chromeos/cros/cryptohome_library.h             | 2 +-
 chrome/browser/chromeos/cros/input_method_library.h           | 2 +-
 chrome/browser/chromeos/cros/keyboard_library.cc              | 2 +-
 chrome/browser/chromeos/cros/keyboard_library.h               | 3 +--
 chrome/browser/chromeos/cros/login_library.h                  | 2 +-
 chrome/browser/chromeos/cros/mock_mount_library.h             | 2 +-
 chrome/browser/chromeos/cros/mount_library.h                  | 2 +-
 chrome/browser/chromeos/cros/network_library.h                | 2 +-
 chrome/browser/chromeos/cros/power_library.h                  | 2 +-
 chrome/browser/chromeos/cros/screen_lock_library.h            | 2 +-
 chrome/browser/chromeos/cros/speech_synthesis_library.cc      | 2 +-
 chrome/browser/chromeos/cros/syslogs_library.h                | 2 +-
 chrome/browser/chromeos/cros/system_library.h                 | 2 +-
 chrome/browser/chromeos/cros/touchpad_library.h               | 2 +-
 chrome/browser/chromeos/cros/update_library.h                 | 2 +-
 chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc         | 2 +-
 .../dom_ui/language_customize_modifier_keys_handler.cc        | 2 +-
 chrome/browser/chromeos/frame/browser_view.cc                 | 2 +-
 chrome/browser/chromeos/frame/bubble_window.cc                | 2 +-
 chrome/browser/chromeos/frame/panel_browser_view.cc           | 2 +-
 chrome/browser/chromeos/frame/panel_controller.cc             | 2 +-
 chrome/browser/chromeos/frame/panel_controller.h              | 2 +-
 chrome/browser/chromeos/google_update_chromeos.cc             | 2 +-
 chrome/browser/chromeos/input_method/candidate_window.cc      | 2 +-
 chrome/browser/chromeos/input_method/candidate_window_main.cc | 2 +-
 chrome/browser/chromeos/login/auth_attempt_state.cc           | 2 +-
 chrome/browser/chromeos/login/background_view.cc              | 4 ++--
 chrome/browser/chromeos/login/screen_locker.cc                | 2 +-
 chrome/browser/chromeos/login/test_attempt_state.cc           | 2 +-
 chrome/browser/chromeos/login/user_controller.cc              | 2 +-
 chrome/browser/chromeos/login/wizard_controller.cc            | 2 +-
 chrome/browser/chromeos/notifications/notification_panel.cc   | 2 +-
 chrome/browser/chromeos/options/language_config_model.h       | 2 +-
 chrome/browser/chromeos/panels/panel_browsertest.cc           | 2 +-
 chrome/browser/chromeos/system_key_event_listener.cc          | 2 +-
 chrome/browser/chromeos/views/domui_menu_widget.cc            | 2 +-
 chrome/browser/chromeos/wm_ipc.h                              | 2 +-
 chrome/browser/chromeos/wm_overview_fav_icon.cc               | 2 +-
 chrome/browser/chromeos/wm_overview_title.cc                  | 2 +-
 chrome/browser/ui/views/browser_bubble_gtk.cc                 | 2 +-
 chrome/browser/ui/views/extensions/extension_popup.cc         | 2 +-
 chrome/browser/ui/views/info_bubble.cc                        | 2 +-
 ppapi/ppapi.gyp                                               | 4 ----
 48 files changed, 48 insertions(+), 54 deletions(-)

diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index f434e8fef2f81..a052a2d034189 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -7,7 +7,6 @@ include_rules = [
   "+chrome/profile_import",
   "+chrome/tools/profiles",  # For history unit tests.
   "+chrome/views",
-  "+cros",
   "+grit",  # For generated headers
   "+ppapi/proxy",
   "+rlz",
@@ -15,6 +14,7 @@ include_rules = [
   "+sandbox/src",  # The path doesn't say it, but this is the Windows sandbox.
   "+skia/ext",
   "+skia/include",
+  "+third_party/cros",
   "+webkit/database",
   "+webkit/glue",  # Defines some types that are marshalled over IPC.
   "+webkit/plugins",  # Defines some types that are marshalled over IPC.
diff --git a/chrome/browser/chromeos/cros/brightness_library.h b/chrome/browser/chromeos/cros/brightness_library.h
index 442b04906f91e..3ebebec4b809f 100644
--- a/chrome/browser/chromeos/cros/brightness_library.h
+++ b/chrome/browser/chromeos/cros/brightness_library.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_CROS_BRIGHTNESS_LIBRARY_H_
 #pragma once
 
-#include "cros/chromeos_brightness.h"
+#include "third_party/cros/chromeos_brightness.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/burn_library.h b/chrome/browser/chromeos/cros/burn_library.h
index 28ebdb15e947b..bc4a65750c885 100644
--- a/chrome/browser/chromeos/cros/burn_library.h
+++ b/chrome/browser/chromeos/cros/burn_library.h
@@ -12,8 +12,7 @@
 #include "base/file_path.h"
 #include "base/observer_list.h"
 #include "base/weak_ptr.h"
-
-#include "cros/chromeos_imageburn.h"
+#include "third_party/cros/chromeos_imageburn.h"
 
 struct ImageBurnStatus {
   explicit ImageBurnStatus(const chromeos::BurnStatus& status)
diff --git a/chrome/browser/chromeos/cros/cros_library_loader.cc b/chrome/browser/chromeos/cros/cros_library_loader.cc
index a54280283d0c5..d53d187af18e6 100644
--- a/chrome/browser/chromeos/cros/cros_library_loader.cc
+++ b/chrome/browser/chromeos/cros/cros_library_loader.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
-#include "cros/chromeos_cros_api.h"
+#include "third_party/cros/chromeos_cros_api.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/cros_mock.h b/chrome/browser/chromeos/cros/cros_mock.h
index c39843eebc86f..990b43fa7ba92 100644
--- a/chrome/browser/chromeos/cros/cros_mock.h
+++ b/chrome/browser/chromeos/cros/cros_mock.h
@@ -8,7 +8,7 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/test/in_process_browser_test.h"
-#include "cros/chromeos_input_method.h"
+#include "third_party/cros/chromeos_input_method.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/cryptohome_library.h b/chrome/browser/chromeos/cros/cryptohome_library.h
index 0daa2b5c859bb..2a1d06601db6e 100644
--- a/chrome/browser/chromeos/cros/cryptohome_library.h
+++ b/chrome/browser/chromeos/cros/cryptohome_library.h
@@ -10,7 +10,7 @@
 
 #include "base/singleton.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "cros/chromeos_cryptohome.h"
+#include "third_party/cros/chromeos_cryptohome.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/input_method_library.h b/chrome/browser/chromeos/cros/input_method_library.h
index 7f55eea2609aa..c30db2fb83cc9 100644
--- a/chrome/browser/chromeos/cros/input_method_library.h
+++ b/chrome/browser/chromeos/cros/input_method_library.h
@@ -12,7 +12,7 @@
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "base/timer.h"
-#include "cros/chromeos_input_method.h"
+#include "third_party/cros/chromeos_input_method.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/keyboard_library.cc b/chrome/browser/chromeos/cros/keyboard_library.cc
index c7728c15726fe..c762390149d76 100644
--- a/chrome/browser/chromeos/cros/keyboard_library.cc
+++ b/chrome/browser/chromeos/cros/keyboard_library.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/cros/keyboard_library.h"
 
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "cros/chromeos_keyboard.h"
+#include "third_party/cros/chromeos_keyboard.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/keyboard_library.h b/chrome/browser/chromeos/cros/keyboard_library.h
index b5f0debafa7c8..d29f0e6512a7a 100644
--- a/chrome/browser/chromeos/cros/keyboard_library.h
+++ b/chrome/browser/chromeos/cros/keyboard_library.h
@@ -6,11 +6,10 @@
 #define CHROME_BROWSER_CHROMEOS_CROS_KEYBOARD_LIBRARY_H_
 #pragma once
 
-#include "cros/chromeos_keyboard.h"
-
 #include <string>
 
 #include "base/basictypes.h"
+#include "third_party/cros/chromeos_keyboard.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/login_library.h b/chrome/browser/chromeos/cros/login_library.h
index b9ba6e1d4bad5..9cb687c1303ed 100644
--- a/chrome/browser/chromeos/cros/login_library.h
+++ b/chrome/browser/chromeos/cros/login_library.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/singleton.h"
-#include "cros/chromeos_login.h"
+#include "third_party/cros/chromeos_login.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/mock_mount_library.h b/chrome/browser/chromeos/cros/mock_mount_library.h
index 32a52c2d3476c..bc0f79a271add 100644
--- a/chrome/browser/chromeos/cros/mock_mount_library.h
+++ b/chrome/browser/chromeos/cros/mock_mount_library.h
@@ -11,9 +11,9 @@
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/cros/mount_library.h"
-#include "cros/chromeos_mount.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/cros/chromeos_mount.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/mount_library.h b/chrome/browser/chromeos/cros/mount_library.h
index f54ba53f6d9a5..21b1dacd5ffa1 100644
--- a/chrome/browser/chromeos/cros/mount_library.h
+++ b/chrome/browser/chromeos/cros/mount_library.h
@@ -12,7 +12,7 @@
 #include "base/observer_list.h"
 #include "base/singleton.h"
 #include "base/time.h"
-#include "cros/chromeos_mount.h"
+#include "third_party/cros/chromeos_mount.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index 2f97c71c2643a..99780e25759a7 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -16,7 +16,7 @@
 #include "base/singleton.h"
 #include "base/string16.h"
 #include "base/timer.h"
-#include "cros/chromeos_network.h"
+#include "third_party/cros/chromeos_network.h"
 
 class Value;
 
diff --git a/chrome/browser/chromeos/cros/power_library.h b/chrome/browser/chromeos/cros/power_library.h
index 83a5fc44d35af..ed61e1d402841 100644
--- a/chrome/browser/chromeos/cros/power_library.h
+++ b/chrome/browser/chromeos/cros/power_library.h
@@ -9,7 +9,7 @@
 #include "base/observer_list.h"
 #include "base/singleton.h"
 #include "base/time.h"
-#include "cros/chromeos_power.h"
+#include "third_party/cros/chromeos_power.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/screen_lock_library.h b/chrome/browser/chromeos/cros/screen_lock_library.h
index 251c6f4f8a680..5bc70c73b593f 100644
--- a/chrome/browser/chromeos/cros/screen_lock_library.h
+++ b/chrome/browser/chromeos/cros/screen_lock_library.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/observer_list.h"
-#include "cros/chromeos_screen_lock.h"
+#include "third_party/cros/chromeos_screen_lock.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/speech_synthesis_library.cc b/chrome/browser/chromeos/cros/speech_synthesis_library.cc
index 14860ba99029a..859a986462ab5 100644
--- a/chrome/browser/chromeos/cros/speech_synthesis_library.cc
+++ b/chrome/browser/chromeos/cros/speech_synthesis_library.cc
@@ -6,7 +6,7 @@
 
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "cros/chromeos_speech_synthesis.h"
+#include "third_party/cros/chromeos_speech_synthesis.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/syslogs_library.h b/chrome/browser/chromeos/cros/syslogs_library.h
index 6b8c441064776..de53694564995 100644
--- a/chrome/browser/chromeos/cros/syslogs_library.h
+++ b/chrome/browser/chromeos/cros/syslogs_library.h
@@ -8,7 +8,7 @@
 
 #include "base/singleton.h"
 #include "chrome/browser/cancelable_request.h"
-#include "cros/chromeos_syslogs.h"
+#include "third_party/cros/chromeos_syslogs.h"
 
 class CancelableRequestConsumerBase;
 
diff --git a/chrome/browser/chromeos/cros/system_library.h b/chrome/browser/chromeos/cros/system_library.h
index 9cf664016045e..414e9c183c16b 100644
--- a/chrome/browser/chromeos/cros/system_library.h
+++ b/chrome/browser/chromeos/cros/system_library.h
@@ -8,7 +8,7 @@
 
 #include "base/observer_list.h"
 #include "base/singleton.h"
-#include "cros/chromeos_system.h"
+#include "third_party/cros/chromeos_system.h"
 #include "unicode/timezone.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/cros/touchpad_library.h b/chrome/browser/chromeos/cros/touchpad_library.h
index ab5ea39ddfa66..09c23efbf3663 100644
--- a/chrome/browser/chromeos/cros/touchpad_library.h
+++ b/chrome/browser/chromeos/cros/touchpad_library.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_CROS_TOUCHPAD_LIBRARY_H_
 #pragma once
 
-#include "cros/chromeos_touchpad.h"
+#include "third_party/cros/chromeos_touchpad.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/update_library.h b/chrome/browser/chromeos/cros/update_library.h
index e8a9daa5f0932..0ad23c03c06e9 100644
--- a/chrome/browser/chromeos/cros/update_library.h
+++ b/chrome/browser/chromeos/cros/update_library.h
@@ -11,7 +11,7 @@
 #include "base/observer_list.h"
 #include "base/singleton.h"
 #include "base/time.h"
-#include "cros/chromeos_update_engine.h"
+#include "third_party/cros/chromeos_update_engine.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc b/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc
index 6944195501c6e..9a2c0ceef2116 100644
--- a/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc
+++ b/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc
@@ -16,9 +16,9 @@
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
-#include "cros/chromeos_input_method.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
+#include "third_party/cros/chromeos_input_method.h"
 
 
 class KeyboardOverlayUIHTMLSource : public ChromeURLDataManager::DataSource {
diff --git a/chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.cc b/chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.cc
index 954b971c1916f..56e4448d63bd7 100644
--- a/chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.cc
@@ -6,8 +6,8 @@
 
 #include "app/l10n_util.h"
 #include "base/values.h"
-#include "cros/chromeos_keyboard.h"
 #include "grit/generated_resources.h"
+#include "third_party/cros/chromeos_keyboard.h"
 
 namespace {
 const struct ModifierKeysSelectItem {
diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc
index abb821992867c..870a4f669aee4 100644
--- a/chrome/browser/chromeos/frame/browser_view.cc
+++ b/chrome/browser/chromeos/frame/browser_view.cc
@@ -27,9 +27,9 @@
 #include "chrome/browser/views/theme_background.h"
 #include "chrome/browser/views/toolbar_view.h"
 #include "chrome/common/chrome_switches.h"
-#include "cros/chromeos_wm_ipc_enums.h"
 #include "gfx/canvas.h"
 #include "grit/generated_resources.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/menu/menu_2.h"
diff --git a/chrome/browser/chromeos/frame/bubble_window.cc b/chrome/browser/chromeos/frame/bubble_window.cc
index 8f3f4a47347da..9fc368447375e 100644
--- a/chrome/browser/chromeos/frame/bubble_window.cc
+++ b/chrome/browser/chromeos/frame/bubble_window.cc
@@ -8,8 +8,8 @@
 
 #include "chrome/browser/chromeos/frame/bubble_frame_view.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
-#include "cros/chromeos_wm_ipc_enums.h"
 #include "gfx/skia_utils_gtk.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "views/window/non_client_view.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/frame/panel_browser_view.cc b/chrome/browser/chromeos/frame/panel_browser_view.cc
index a7f075a0b5519..74c08aea81a16 100644
--- a/chrome/browser/chromeos/frame/panel_browser_view.cc
+++ b/chrome/browser/chromeos/frame/panel_browser_view.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/frame/panel_browser_view.h"
 
 #include "chrome/browser/chromeos/frame/panel_controller.h"
-#include "cros/chromeos_wm_ipc_enums.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc
index ef5d9177faba2..31f4961fe9237 100644
--- a/chrome/browser/chromeos/frame/panel_controller.cc
+++ b/chrome/browser/chromeos/frame/panel_controller.cc
@@ -15,11 +15,11 @@
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/notification_service.h"
-#include "cros/chromeos_wm_ipc_enums.h"
 #include "gfx/canvas_skia.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/controls/button/image_button.h"
diff --git a/chrome/browser/chromeos/frame/panel_controller.h b/chrome/browser/chromeos/frame/panel_controller.h
index 5d4920f3e9253..e642cfe78188a 100644
--- a/chrome/browser/chromeos/frame/panel_controller.h
+++ b/chrome/browser/chromeos/frame/panel_controller.h
@@ -9,7 +9,7 @@
 #include <gtk/gtk.h>
 
 #include "app/x11_util.h"
-#include "cros/chromeos_wm_ipc_enums.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "views/controls/button/button.h"
 
 class BrowserView;
diff --git a/chrome/browser/chromeos/google_update_chromeos.cc b/chrome/browser/chromeos/google_update_chromeos.cc
index f7aa241cee293..88a63d98826d3 100644
--- a/chrome/browser/chromeos/google_update_chromeos.cc
+++ b/chrome/browser/chromeos/google_update_chromeos.cc
@@ -12,7 +12,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "cros/chromeos_update.h"
+#include "third_party/cros/chromeos_update.h"
 #include "views/window/window.h"
 
 using views::Window;
diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc
index 6a30f982929fc..a88b6bf5f91c1 100644
--- a/chrome/browser/chromeos/input_method/candidate_window.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window.cc
@@ -14,9 +14,9 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
-#include "cros/chromeos_input_method_ui.h"
 #include "gfx/canvas.h"
 #include "gfx/font.h"
+#include "third_party/cros/chromeos_input_method_ui.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/event.h"
diff --git a/chrome/browser/chromeos/input_method/candidate_window_main.cc b/chrome/browser/chromeos/input_method/candidate_window_main.cc
index a8fbb15350ac9..a8bc0427f087d 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_main.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window_main.cc
@@ -19,8 +19,8 @@
 #include "chrome/browser/chromeos/cros/cros_library_loader.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "cros/chromeos_cros_api.h"
 #include "grit/app_locale_settings.h"
+#include "third_party/cros/chromeos_cros_api.h"
 #include "views/focus/accelerator_handler.h"
 
 int main(int argc, char** argv) {
diff --git a/chrome/browser/chromeos/login/auth_attempt_state.cc b/chrome/browser/chromeos/login/auth_attempt_state.cc
index 459f7e9151205..830ee4a3ca54e 100644
--- a/chrome/browser/chromeos/login/auth_attempt_state.cc
+++ b/chrome/browser/chromeos/login/auth_attempt_state.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
-#include "cros/chromeos_cryptohome.h"
+#include "third_party/cros/chromeos_cryptohome.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc
index f3cad3451d8f4..9ce54f65d3bf2 100644
--- a/chrome/browser/chromeos/login/background_view.cc
+++ b/chrome/browser/chromeos/login/background_view.cc
@@ -27,12 +27,12 @@
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/views/dom_view.h"
-#include "cros/chromeos_wm_ipc_enums.h"
-#include "googleurl/src/gurl.h"
 #include "gfx/gtk_util.h"
+#include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/screen.h"
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index 29730a1f77167..0a3ef83d3effa 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -45,10 +45,10 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
-#include "cros/chromeos_wm_ipc_enums.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
diff --git a/chrome/browser/chromeos/login/test_attempt_state.cc b/chrome/browser/chromeos/login/test_attempt_state.cc
index b9a00b7c3c138..ecbf670a9d856 100644
--- a/chrome/browser/chromeos/login/test_attempt_state.cc
+++ b/chrome/browser/chromeos/login/test_attempt_state.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
-#include "cros/chromeos_cryptohome.h"
+#include "third_party/cros/chromeos_cryptohome.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc
index 7412c8ceffeee..888803ab3e0de 100644
--- a/chrome/browser/chromeos/login/user_controller.cc
+++ b/chrome/browser/chromeos/login/user_controller.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
-#include "cros/chromeos_wm_ipc_enums.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "gfx/canvas.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index db100bcd817ca..15cc8b5fa7b8e 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -48,7 +48,7 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
-#include "cros/chromeos_wm_ipc_enums.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "unicode/timezone.h"
 #include "views/accelerator.h"
 #include "views/painter.h"
diff --git a/chrome/browser/chromeos/notifications/notification_panel.cc b/chrome/browser/chromeos/notifications/notification_panel.cc
index efd8c1a6b5321..4bd0b3a13eed9 100644
--- a/chrome/browser/chromeos/notifications/notification_panel.cc
+++ b/chrome/browser/chromeos/notifications/notification_panel.cc
@@ -14,9 +14,9 @@
 #include "chrome/browser/chromeos/notifications/balloon_view.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
-#include "cros/chromeos_wm_ipc_enums.h"
 #include "gfx/canvas.h"
 #include "grit/generated_resources.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "views/background.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/scroll_view.h"
diff --git a/chrome/browser/chromeos/options/language_config_model.h b/chrome/browser/chromeos/options/language_config_model.h
index d8662bedb641d..c401c6f374b40 100644
--- a/chrome/browser/chromeos/options/language_config_model.h
+++ b/chrome/browser/chromeos/options/language_config_model.h
@@ -14,7 +14,7 @@
 #include "chrome/browser/language_combobox_model.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "cros/chromeos_input_method.h"
+#include "third_party/cros/chromeos_input_method.h"
 
 class Profile;
 
diff --git a/chrome/browser/chromeos/panels/panel_browsertest.cc b/chrome/browser/chromeos/panels/panel_browsertest.cc
index 74f2a543a897e..f928371c90927 100644
--- a/chrome/browser/chromeos/panels/panel_browsertest.cc
+++ b/chrome/browser/chromeos/panels/panel_browsertest.cc
@@ -11,7 +11,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
-#include "cros/chromeos_wm_ipc_enums.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/system_key_event_listener.cc b/chrome/browser/chromeos/system_key_event_listener.cc
index 9ebaeebc08cc8..2df12ddd711ec 100644
--- a/chrome/browser/chromeos/system_key_event_listener.cc
+++ b/chrome/browser/chromeos/system_key_event_listener.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/chromeos/audio_handler.h"
 #include "chrome/browser/chromeos/brightness_bubble.h"
 #include "chrome/browser/chromeos/volume_bubble.h"
-#include "cros/chromeos_wm_ipc_enums.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/views/domui_menu_widget.cc b/chrome/browser/chromeos/views/domui_menu_widget.cc
index b0cda2b81b8e3..a20aec0d0e9c7 100644
--- a/chrome/browser/chromeos/views/domui_menu_widget.cc
+++ b/chrome/browser/chromeos/views/domui_menu_widget.cc
@@ -18,9 +18,9 @@
 #include "chrome/browser/views/dom_view.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
-#include "cros/chromeos_wm_ipc_enums.h"
 #include "gfx/canvas_skia.h"
 #include "googleurl/src/gurl.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/border.h"
 #include "views/layout_manager.h"
diff --git a/chrome/browser/chromeos/wm_ipc.h b/chrome/browser/chromeos/wm_ipc.h
index 4437598fd7ef1..a0c8abd97d592 100644
--- a/chrome/browser/chromeos/wm_ipc.h
+++ b/chrome/browser/chromeos/wm_ipc.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "base/logging.h"
-#include "cros/chromeos_wm_ipc_enums.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 
 typedef unsigned long Atom;
 typedef unsigned long XID;
diff --git a/chrome/browser/chromeos/wm_overview_fav_icon.cc b/chrome/browser/chromeos/wm_overview_fav_icon.cc
index dea1b0e63dc72..ad9dfa832c509 100644
--- a/chrome/browser/chromeos/wm_overview_fav_icon.cc
+++ b/chrome/browser/chromeos/wm_overview_fav_icon.cc
@@ -9,8 +9,8 @@
 #include "app/x11_util.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/chromeos/wm_overview_snapshot.h"
-#include "cros/chromeos_wm_ipc_enums.h"
 #include "skia/ext/image_operations.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
diff --git a/chrome/browser/chromeos/wm_overview_title.cc b/chrome/browser/chromeos/wm_overview_title.cc
index a5ce96e6d51be..7c6c5b6846594 100644
--- a/chrome/browser/chromeos/wm_overview_title.cc
+++ b/chrome/browser/chromeos/wm_overview_title.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/chromeos/wm_overview_snapshot.h"
 #include "chrome/browser/ui/browser.h"
-#include "cros/chromeos_wm_ipc_enums.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/border.h"
 #include "views/grid_layout.h"
diff --git a/chrome/browser/ui/views/browser_bubble_gtk.cc b/chrome/browser/ui/views/browser_bubble_gtk.cc
index 7f18070523960..e11e8e4d12eeb 100644
--- a/chrome/browser/ui/views/browser_bubble_gtk.cc
+++ b/chrome/browser/ui/views/browser_bubble_gtk.cc
@@ -10,7 +10,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/wm_ipc.h"
-#include "cros/chromeos_wm_ipc_enums.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc
index 5a5120c7ab0ce..a5c11beb09fc7 100644
--- a/chrome/browser/ui/views/extensions/extension_popup.cc
+++ b/chrome/browser/ui/views/extensions/extension_popup.cc
@@ -31,7 +31,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/wm_ipc.h"
-#include "cros/chromeos_wm_ipc_enums.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #endif
 
 using views::Widget;
diff --git a/chrome/browser/ui/views/info_bubble.cc b/chrome/browser/ui/views/info_bubble.cc
index d8a3306c0971e..12e6937cfca61 100644
--- a/chrome/browser/ui/views/info_bubble.cc
+++ b/chrome/browser/ui/views/info_bubble.cc
@@ -20,7 +20,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/wm_ipc.h"
-#include "cros/chromeos_wm_ipc_enums.h"
+#include "third_party/cros/chromeos_wm_ipc_enums.h"
 #endif
 
 // How long the fade should last for.
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp
index 1cc6404048e45..c41b4d9afe4fd 100644
--- a/ppapi/ppapi.gyp
+++ b/ppapi/ppapi.gyp
@@ -33,10 +33,6 @@
       'all_dependent_settings': {
         'include_dirs': [
           '..',
-           # HOLEY (*#@$@ing #&$^@*&$^. ChromeOS depends on having
-           # "third_party" in the include path which the old version of this
-           # project did. This is a temporary hack to keep the build going.
-           '../third_party',
         ],
       },
       'sources': [
-- 
GitLab