Exclude ProtectorService code from Android build.

chrome/browser/automation/testing_automation_provider.cc

Index: chrome/browser/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 38ad5400d119b82b0bec17906a97a1810f0e3f65..eb21907df9840e32d9b43ca958bb062c93006b90 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -77,6 +77,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/protector/protector.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ -2528,10 +2529,12 @@ void TestingAutomationProvider::SendJSONRequest(int handle,
   browser_handler_map["PerformActionOnSearchEngine"] =
       &TestingAutomationProvider::PerformActionOnSearchEngine;
 
+#if defined(ENABLE_PROTECTOR_SERVICE)

[Yaron, 2012/03/28 21:23:22]

Hmm. This shouldn't really be necessary as chrome/browser/automation is excluded
for Android builds but I guess it's more correct.

   browser_handler_map["GetProtectorState"] =
       &TestingAutomationProvider::GetProtectorState;
   browser_handler_map["PerformProtectorAction"] =
       &TestingAutomationProvider::PerformProtectorAction;
+#endif
 
   browser_handler_map["SetWindowDimensions"] =
       &TestingAutomationProvider::SetWindowDimensions;
@@ -3454,6 +3457,7 @@ void TestingAutomationProvider::PerformActionOnSearchEngine(
   }
 }
 
+#if defined(ENABLE_PROTECTOR_SERVICE)
 // Sample json output: { "enabled": true,
 //                       "showing_change": false }
 void TestingAutomationProvider::GetProtectorState(
@@ -3498,6 +3502,7 @@ void TestingAutomationProvider::PerformProtectorAction(
     return reply.SendError("Invalid 'action' value");
   reply.SendSuccess(NULL);
 }
+#endif

[Yaron, 2012/03/28 21:23:22]

When this is far enough away from the #if, add: #endif   //
defined(ENABLE_PROTECTOR_SERVICE)

[nilesh, 2012/03/28 23:35:11]

Done.

 
 // Sample json input: { "command": "GetLocalStatePrefsInfo" }
 // Refer chrome/test/pyautolib/prefs_info.py for sample json output.