Create top-level ios/public/ directory.

To better mirror the structure of other API layers (content/public and
third_party/WebKit/public), there will be a single ios/public/ directory that
contains all interfaces referenced by not-yet-upstreamed Chrome for iOS code,
rather than these interfaces being scattered in subdirectories further
underneath ios/.

This CL also changes gyp structure to better match other modules: ios_consumer.gyp is moved to directly under ios/, and an ios.gyp is created with a single top-level "ios" target to be used in build/all.gyp.

Review URL: https://chromiumcodereview.appspot.com/18272004

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

8 files changed, 38 insertions, 21 deletions

diff --git a/ios/consumer/base/supports_user_data.cc b/ios/consumer/base/supports_user_data.cc
index f317fa2..74ed3a7 100644
--- a/ios/consumer/base/supports_user_data.cc
+++ b/ios/consumer/base/supports_user_data.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ios/consumer/public/base/supports_user_data.h"
+#include "ios/public/consumer/base/supports_user_data.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/supports_user_data.h"
diff --git a/ios/consumer/base/supports_user_data_unittest.cc b/ios/consumer/base/supports_user_data_unittest.cc
index b38c2db..1aeb417 100644
--- a/ios/consumer/base/supports_user_data_unittest.cc
+++ b/ios/consumer/base/supports_user_data_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ios/consumer/public/base/supports_user_data.h"
+#include "ios/public/consumer/base/supports_user_data.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/ios/consumer/base/util.mm b/ios/consumer/base/util.mm
index 6a94f8f..1e640f5 100644
--- a/ios/consumer/base/util.mm
+++ b/ios/consumer/base/util.mm
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/ios/ios_util.h"
-#include "ios/consumer/public/base/util.h"
+#include "ios/public/consumer/base/util.h"
 
 namespace ios {
 
diff --git a/ios/ios.gyp b/ios/ios.gyp
new file mode 100644
index 0000000..5e835b3
--- /dev/null
+++ b/ios/ios.gyp
@@ -0,0 +1,17 @@
+# Copyright 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.
+{
+  'variables': {
+    'chromium_code': 1,
+   },
+  'targets': [
+    {
+      'target_name': 'ios',
+      'type': 'none',
+      'dependencies': [
+        'ios_consumer.gyp:*',
+      ],
+    },
+  ],
+}
diff --git a/ios/consumer/ios_consumer.gyp b/ios/ios_consumer.gyp
index 3844e9b..f83a0eb 100644
--- a/ios/consumer/ios_consumer.gyp
+++ b/ios/ios_consumer.gyp
@@ -10,31 +10,31 @@
       'target_name': 'ios_consumer_base',
       'type': 'static_library',
       'dependencies': [
-        '../../base/base.gyp:base',
+        '../base/base.gyp:base',
       ],
       'include_dirs': [
-        '../..',
+        '..',
       ],
       'sources': [
-        'base/supports_user_data.cc',
-        'base/util.mm',
-        'public/base/supports_user_data.h',
-        'public/base/util.h',
+        'consumer/base/supports_user_data.cc',
+        'consumer/base/util.mm',
+        'public/consumer/base/supports_user_data.h',
+        'public/consumer/base/util.h',
       ],
     },
     {
       'target_name': 'ios_consumer_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
-        '../../base/base.gyp:base',
-        '../../base/base.gyp:run_all_unittests',
-        '../../base/base.gyp:test_support_base',
-        '../../testing/gmock.gyp:gmock',
-        '../../testing/gtest.gyp:gtest',
+        '../base/base.gyp:base',
+        '../base/base.gyp:run_all_unittests',
+        '../base/base.gyp:test_support_base',
+        '../testing/gmock.gyp:gmock',
+        '../testing/gtest.gyp:gtest',
         'ios_consumer_base',
       ],
       'sources': [
-        'base/supports_user_data_unittest.cc',
+        'consumer/base/supports_user_data_unittest.cc',
       ],
     },
   ],
diff --git a/ios/consumer/public/DEPS b/ios/public/DEPS
index b9ffa71..b9ffa71 100644
--- a/ios/consumer/public/DEPS
+++ b/ios/public/DEPS
diff --git a/ios/consumer/public/base/supports_user_data.h b/ios/public/consumer/base/supports_user_data.h
index 16b5ebe..5986c57 100644
--- a/ios/consumer/public/base/supports_user_data.h
+++ b/ios/public/consumer/base/supports_user_data.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_BASE_SUPPORTS_USER_DATA_H_
-#define IOS_BASE_SUPPORTS_USER_DATA_H_
+#ifndef IOS_PUBLIC_CONSUMER_BASE_SUPPORTS_USER_DATA_H_
+#define IOS_PUBLIC_CONSUMER_BASE_SUPPORTS_USER_DATA_H_
 
 namespace ios {
 
@@ -47,4 +47,4 @@ class SupportsUserData {
 
 }  // namespace ios
 
-#endif  // IOS_BASE_SUPPORTS_USER_DATA_H_
+#endif  // IOS_PUBLIC_CONSUMER_BASE_SUPPORTS_USER_DATA_H_
diff --git a/ios/consumer/public/base/util.h b/ios/public/consumer/base/util.h
index 9820834..5977ea7 100644
--- a/ios/consumer/public/base/util.h
+++ b/ios/public/consumer/base/util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_CONSUME_PUBLIC_BASE_UTIL_H_
-#define IOS_CONSUME_PUBLIC_BASE_UTIL_H_
+#ifndef IOS_PUBLIC_CONSUMER_BASE_UTIL_H_
+#define IOS_PUBLIC_CONSUMER_BASE_UTIL_H_
 
 namespace ios {
 
@@ -15,4 +15,4 @@ bool IsRunningOnOrLater(int major, int minor, int bug_fix);
 
 }  // namespace ios
 
-#endif  // IOS_CONSUME_PUBLIC_BASE_UTIL_H_
+#endif  // IOS_PUBLIC_CONSUMER_BASE_UTIL_H_