Android: Exclude feedback and storage monitor code.

BUG=305852,337663
TBR=rkc@chromium.org

Review URL: https://codereview.chromium.org/300013002

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

8 files changed, 29 insertions, 26 deletions

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index e1b33d8..c8118f0 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -52,7 +52,6 @@
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/startup_helper.h"
-#include "chrome/browser/feedback/feedback_profile_observer.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/first_run/upgrade_util.h"
 #include "chrome/browser/google/google_search_counter.h"
@@ -141,6 +140,8 @@
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/metrics/thread_watcher_android.h"
+#else
+#include "chrome/browser/feedback/feedback_profile_observer.h"
 #endif
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -987,14 +988,14 @@ void ChromeBrowserMainParts::PreMainMessageLoopRun() {
 void ChromeBrowserMainParts::PreProfileInit() {
   TRACE_EVENT0("startup", "ChromeBrowserMainParts::PreProfileInit");
 
-  // Initialize the feedback uploader so it can setup notifications for profile
-  // creation.
-  feedback::FeedbackProfileObserver::Initialize();
-
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PreProfileInit();
 
 #if !defined(OS_ANDROID)
+  // Initialize the feedback uploader so it can setup notifications for profile
+  // creation.
+  feedback::FeedbackProfileObserver::Initialize();
+
   ProfileManager* profile_manager = g_browser_process->profile_manager();
 
   // First check if any ephemeral profiles are left behind because of browser
@@ -1315,7 +1316,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   // Verify that the profile is not on a network share and if so prepare to show
   // notification to the user.
   if (NetworkProfileBubble::ShouldCheckNetworkProfile(profile_)) {
-    content::BrowserThread::PostTask(content::BrowserThread::FILE, FROM_HERE,
+    BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&NetworkProfileBubble::CheckNetworkProfile,
                    profile_->GetPath()));
   }
@@ -1428,8 +1429,8 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
 #endif
 
 #if !defined(DISABLE_NACL)
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO,
+  BrowserThread::PostTask(
+      BrowserThread::IO,
       FROM_HERE,
       base::Bind(nacl::NaClProcessHost::EarlyStartup));
 #endif
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 7f2a0ae..ff18da9 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3185,6 +3185,7 @@
             'chrome_browser_jni_headers',
           ],
           'dependencies!': [
+            '../components/components.gyp:feedback_component',
             '../components/components.gyp:storage_monitor',
             '../components/components.gyp:usb_service',
             '../components/components.gyp:web_modal',
@@ -3305,6 +3306,7 @@
           'sources/': [
             ['exclude', '^browser/captive_portal/'],
             ['exclude', '^browser/diagnostics/'],
+            ['exclude', '^browser/feedback/'],
             ['exclude', '^browser/first_run/'],
             ['exclude', '^browser/importer/'],
             ['exclude', '^browser/media_galleries/'],
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 0512f4d..40df172 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2516,11 +2516,6 @@
             '../printing/printing.gyp:printing',
           ],
         }],
-        ['OS == "android"', {
-          'dependencies': [
-            '../third_party/openssl/openssl.gyp:openssl',
-          ],
-        }],
         ['OS!="android" and OS!="ios"', {
           'sources!': [
             'browser/ui/auto_login_infobar_delegate.cc',
@@ -2788,9 +2783,11 @@
         ['OS=="android"', {
           'dependencies': [
             '../components/components.gyp:web_contents_delegate_android',
+            '../third_party/openssl/openssl.gyp:openssl',
             'chrome_browser_jni_headers',
           ],
           'dependencies!': [
+             '../components/components.gyp:feedback_proto',
              '../third_party/libusb/libusb.gyp:libusb',
              '../ui/events/events.gyp:events',
              'chrome_browser_ui_views.gyp:browser_ui_views',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 42c2fdf..1e404e1 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2020,7 +2020,7 @@
           ]
         }],
         ['enable_autofill_dialog!=1 or OS=="android" or OS=="ios"', {
-          '!dependencies': [
+          'dependencies!': [
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
           ],
         }],
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 30a759e..9cf650a 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -373,7 +373,7 @@
           ],
         }],
         ['OS=="android"', {
-          '!dependencies': [
+          'dependencies!': [
             '../components/components.gyp:storage_monitor_test_support',
           ],
           'sources/': [
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
index 36c4f58..63af0dd 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/api.gyp
@@ -142,7 +142,6 @@
                 'context_menus.json',
                 'downloads.idl',
                 'events.json',
-                'feedback_private.idl',
                 'file_system.idl',
                 'manifest_types.json',
                 'omnibox.json',
diff --git a/components/components.gyp b/components/components.gyp
index ef080c0..f334768b 100644
--- a/components/components.gyp
+++ b/components/components.gyp
@@ -23,7 +23,6 @@
     'enhanced_bookmarks.gypi',
     'favicon.gypi',
     'favicon_base.gypi',
-    'feedback.gypi',  # crbug.com/368738
     'google.gypi',
     'infobars.gypi',
     'json_schema.gypi',
@@ -55,22 +54,27 @@
         'navigation_interception.gypi',
         'plugins.gypi',
         'sessions.gypi',
-        'storage_monitor.gypi',
         'visitedlink.gypi',
         'web_contents_delegate_android.gypi',
         'web_modal.gypi',
       ],
     }],
-    ['OS == "win" or OS == "mac"', {
+    ['OS != "android"', {
       'includes': [
-        'wifi.gypi',
-      ],
+        'feedback.gypi',
+      ]
     }],
     ['OS != "ios" and OS != "android"', {
       'includes': [
+        'storage_monitor.gypi',
         'usb_service.gypi',
       ]
     }],
+    ['OS == "win" or OS == "mac"', {
+      'includes': [
+        'wifi.gypi',
+      ],
+    }],
     ['android_webview_build == 0', {
       # Android WebView fails to build if a dependency on these targets is
       # introduced.
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 241f26a9..43e1f47 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -431,6 +431,7 @@
             }],
             ['OS == "android"', {
               'sources!': [
+                'feedback/feedback_uploader_unittest.cc',
                 'signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc',
                 'storage_monitor/media_storage_util_unittest.cc',
                 'storage_monitor/storage_info_unittest.cc',
@@ -438,7 +439,11 @@
                 'usb_service/usb_context_unittest.cc',
                 'web_modal/web_contents_modal_dialog_manager_unittest.cc',
               ],
+              'dependencies': [
+                '../testing/android/native_test.gyp:native_test_native_code',
+              ],
               'dependencies!': [
+                'components.gyp:feedback_component',
                 'components.gyp:storage_monitor',
                 'components.gyp:storage_monitor_test_support',
                 'components.gyp:usb_service',
@@ -447,11 +452,6 @@
                 '../third_party/libusb/libusb.gyp:libusb',
               ],
             }],
-            ['OS == "android"', {
-              'dependencies': [
-                '../testing/android/native_test.gyp:native_test_native_code',
-              ]
-            }],
             ['chromeos==1', {
               'sources': [
                 'metrics/chromeos/serialization_utils_unittest.cc',