Exclude ProtectorService code from Android build.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 59 matching lines @@
 #include "chrome/browser/password_manager/password_store_change.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #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"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
@@ skipping 2431 matching lines @@
 
   browser_handler_map["LoadSearchEngineInfo"] =
       &TestingAutomationProvider::LoadSearchEngineInfo;
   browser_handler_map["GetSearchEngineInfo"] =
       &TestingAutomationProvider::GetSearchEngineInfo;
   browser_handler_map["AddOrEditSearchEngine"] =
       &TestingAutomationProvider::AddOrEditSearchEngine;
   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;
 
   browser_handler_map["GetDownloadsInfo"] =
       &TestingAutomationProvider::GetDownloadsInfo;
   browser_handler_map["WaitForAllDownloadsToComplete"] =
       &TestingAutomationProvider::WaitForAllDownloadsToComplete;
   browser_handler_map["PerformActionOnDownload"] =
       &TestingAutomationProvider::PerformActionOnDownload;
@@ skipping 902 matching lines @@
   } else if (action == "default") {
     url_model->AddObserver(new AutomationProviderSearchEngineObserver(
       this, reply_message));
     url_model->SetDefaultSearchProvider(template_url);
   } else {
     AutomationJSONReply(this, reply_message).SendError(
         "Invalid action: " + action);
   }
 }
 
+#if defined(ENABLE_PROTECTOR_SERVICE)
 // Sample json output: { "enabled": true,
 //                       "showing_change": false }
 void TestingAutomationProvider::GetProtectorState(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   protector::ProtectorService* protector_service =
       protector::ProtectorServiceFactory::GetForProfile(browser->profile());
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   return_value->SetBoolean("enabled", protector::IsEnabled());
@@ skipping 24 matching lines @@
   protector::BaseSettingChange* change =
       protector_service->GetLastChange();
   if (action == "apply_change")
     protector_service->ApplyChange(change, browser);
   else if (action == "discard_change")
     protector_service->DiscardChange(change, browser);
   else
     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.
 void TestingAutomationProvider::GetLocalStatePrefsInfo(
     DictionaryValue* args,
     IPC::Message* reply_message) {
   DictionaryValue* items = g_browser_process->local_state()->
       GetPreferenceValues();
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   return_value->Set("prefs", items);  // return_value owns items.
@@ skipping 3573 matching lines @@
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }