Checking in CL http://www.codereview.chromium.org/2836058 on behalf of zbehan@:

chrome: create an option for using libcros provided by the system; fix all
includes referring to libcros to not include third_party/

* Headers fix is needed to support using system libcros (installed to /usr/include)

* All includes are "", and therefore a local variant in third_party/cros/ is
always preferred, but system will also get picked up as a secondary target

* Fixed chrome/browser/chromeos/cros/synaptics_library.h comments to better
reflect the header placement

* Added a variable system_libcros defaulting to 0
* Gotten rid of duplicate cros_api.gyp
* Changed both places to either link against cros_api or libcrosapi

TEST=build in the following scenarios:
1) libcros not installed, libcros sources in third_party/, !defined system_libcros
- sucess
2) installed libcros, put #error into /usr/include/cros/chromeos_cros_api.h, repeat 1)
- success
3) BUILD_DEFINES+=system_libcros=1, removed libcros from third_party, repeat 2)
- fail (on #error in chromeos_cros_api.h)
4) Installed clean libcros, repeat 3)
- success

Review URL: http://codereview.chromium.org/3043010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53288 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 21 insertions, 37 deletions

diff --git a/chrome/browser/chromeos/cros/cros_api.gyp b/chrome/browser/chromeos/cros/cros_api.gyp
index 13b52ec..e69de29 100644
--- a/chrome/browser/chromeos/cros/cros_api.gyp
+++ b/chrome/browser/chromeos/cros/cros_api.gyp
@@ -1,18 +0,0 @@
-{
-  'targets': [
-    { 'target_name': 'cros_api',
-      'type': '<(library)',
-      'sources': [
-        '../../../../third_party/cros/chromeos_power.h',
-        '../../../../third_party/cros/chromeos_network.h',
-        '../../../../third_party/cros/chromeos_syslogs.h',
-        '../../../../third_party/cros/load.cc',
-      ],
-      'include_dirs': [
-        '../../../../third_party/cros',
-        '../../../../third_party',
-        '../../../..',
-      ],
-    },
-  ],
- }
diff --git a/chrome/browser/chromeos/cros/cros_in_process_browser_test.h b/chrome/browser/chromeos/cros/cros_in_process_browser_test.h
index 2b1493a..52e11db 100644
--- a/chrome/browser/chromeos/cros/cros_in_process_browser_test.h
+++ b/chrome/browser/chromeos/cros/cros_in_process_browser_test.h
@@ -8,7 +8,7 @@
 #include "base/scoped_ptr.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/test/in_process_browser_test.h"
-#include "third_party/cros/chromeos_input_method.h"
+#include "cros/chromeos_input_method.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/cros_library_loader.cc b/chrome/browser/chromeos/cros/cros_library_loader.cc
index d53d187..a542802 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 "third_party/cros/chromeos_cros_api.h"
+#include "cros/chromeos_cros_api.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/cryptohome_library.h b/chrome/browser/chromeos/cros/cryptohome_library.h
index fe3676d..6e91d30 100644
--- a/chrome/browser/chromeos/cros/cryptohome_library.h
+++ b/chrome/browser/chromeos/cros/cryptohome_library.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/singleton.h"
-#include "third_party/cros/chromeos_cryptohome.h"
+#include "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 a7bf482..e92b311 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 "third_party/cros/chromeos_input_method.h"
+#include "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 c9c9ab2..ff7a3b1 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 "third_party/cros/chromeos_keyboard.h"
+#include "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 fcdec9e..17e1b42 100644
--- a/chrome/browser/chromeos/cros/keyboard_library.h
+++ b/chrome/browser/chromeos/cros/keyboard_library.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_CHROMEOS_CROS_KEYBOARD_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_KEYBOARD_LIBRARY_H_
 
-#include "third_party/cros/chromeos_keyboard.h"
+#include "cros/chromeos_keyboard.h"
 
 #include <string>
 
diff --git a/chrome/browser/chromeos/cros/login_library.h b/chrome/browser/chromeos/cros/login_library.h
index df1b9b4..3e8936f 100644
--- a/chrome/browser/chromeos/cros/login_library.h
+++ b/chrome/browser/chromeos/cros/login_library.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/singleton.h"
-#include "third_party/cros/chromeos_login.h"
+#include "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 06023e4..e0309ea 100644
--- a/chrome/browser/chromeos/cros/mock_mount_library.h
+++ b/chrome/browser/chromeos/cros/mock_mount_library.h
@@ -10,7 +10,7 @@
 
 #include "base/observer_list.h"
 #include "base/time.h"
-#include "third_party/cros/chromeos_mount.h"
+#include "cros/chromeos_mount.h"
 #include "chrome/browser/chromeos/cros/mount_library.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/chromeos/cros/mount_library.h b/chrome/browser/chromeos/cros/mount_library.h
index 4223274..3fd772a 100644
--- a/chrome/browser/chromeos/cros/mount_library.h
+++ b/chrome/browser/chromeos/cros/mount_library.h
@@ -11,7 +11,7 @@
 #include "base/observer_list.h"
 #include "base/singleton.h"
 #include "base/time.h"
-#include "third_party/cros/chromeos_mount.h"
+#include "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 8374505..9521a41 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -14,7 +14,7 @@
 #include "base/string16.h"
 #include "base/timer.h"
 #include "net/url_request/url_request_job_tracker.h"
-#include "third_party/cros/chromeos_network.h"
+#include "cros/chromeos_network.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/power_library.h b/chrome/browser/chromeos/cros/power_library.h
index dcbab8c..76ab81a 100644
--- a/chrome/browser/chromeos/cros/power_library.h
+++ b/chrome/browser/chromeos/cros/power_library.h
@@ -8,7 +8,7 @@
 #include "base/observer_list.h"
 #include "base/singleton.h"
 #include "base/time.h"
-#include "third_party/cros/chromeos_power.h"
+#include "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 21172fa..829d156 100644
--- a/chrome/browser/chromeos/cros/screen_lock_library.h
+++ b/chrome/browser/chromeos/cros/screen_lock_library.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_CROS_SCREEN_LOCK_LIBRARY_H_
 
 #include "base/observer_list.h"
-#include "third_party/cros/chromeos_screen_lock.h"
+#include "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 b70a458..10194ee 100644
--- a/chrome/browser/chromeos/cros/speech_synthesis_library.cc
+++ b/chrome/browser/chromeos/cros/speech_synthesis_library.cc
@@ -7,7 +7,7 @@
 #include "base/message_loop.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "third_party/cros/chromeos_speech_synthesis.h"
+#include "cros/chromeos_speech_synthesis.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/synaptics_library.h b/chrome/browser/chromeos/cros/synaptics_library.h
index 676e0f9..3dfd69f 100644
--- a/chrome/browser/chromeos/cros/synaptics_library.h
+++ b/chrome/browser/chromeos/cros/synaptics_library.h
@@ -6,14 +6,15 @@
 #define CHROME_BROWSER_CHROMEOS_CROS_SYNAPTICS_LIBRARY_H_
 
 #include "base/singleton.h"
-#include "third_party/cros/chromeos_synaptics.h"
+#include "cros/chromeos_synaptics.h"
 
 namespace chromeos {
 
 // This interface defines interaction with the ChromeOS synaptics library APIs.
 // Users can get an instance of this library class like this:
 //   SynapticsLibrary::Get()
-// For a list of SynapticsPrameters, see third_party/cros/chromeos_synaptics.h
+// For a list of SynapticsPrameters, see chromeos_synaptics.h
+// in third_party/cros or /usr/include/cros
 class SynapticsLibrary {
  public:
   virtual ~SynapticsLibrary() {}
@@ -29,7 +30,8 @@ class SynapticsLibrary {
 // This class handles the interaction with the ChromeOS synaptics library APIs.
 // Users can get an instance of this library class like this:
 //   SynapticsLibrary::Get()
-// For a list of SynapticsPrameters, see third_party/cros/chromeos_synaptics.h
+// For a list of SynapticsPrameters, see chromeos_synaptics.h
+// in third_party/cros or /usr/include/cros
 class SynapticsLibraryImpl : public SynapticsLibrary {
  public:
   SynapticsLibraryImpl() {}
diff --git a/chrome/browser/chromeos/cros/syslogs_library.h b/chrome/browser/chromeos/cros/syslogs_library.h
index 1d7d9ba..e29824c 100644
--- a/chrome/browser/chromeos/cros/syslogs_library.h
+++ b/chrome/browser/chromeos/cros/syslogs_library.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_CROS_SYSLOGS_LIBRARY_H_
 
 #include "base/singleton.h"
-#include "third_party/cros/chromeos_syslogs.h"
+#include "cros/chromeos_syslogs.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/cros/system_library.h b/chrome/browser/chromeos/cros/system_library.h
index 2347785..b33eb3d 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/scoped_ptr.h"
 #include "base/singleton.h"
-#include "third_party/cros/chromeos_system.h"
+#include "cros/chromeos_system.h"
 #include "unicode/timezone.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/cros/update_library.h b/chrome/browser/chromeos/cros/update_library.h
index fe4710b..c57e7bd 100644
--- a/chrome/browser/chromeos/cros/update_library.h
+++ b/chrome/browser/chromeos/cros/update_library.h
@@ -10,7 +10,7 @@
 #include "base/observer_list.h"
 #include "base/singleton.h"
 #include "base/time.h"
-#include "third_party/cros/chromeos_update_engine.h"
+#include "cros/chromeos_update_engine.h"
 
 namespace chromeos {