From 3e9aa219cddabd7a7f5c53bbf5074101c1c71fc2 Mon Sep 17 00:00:00 2001
From: newt <newt@chromium.org>
Date: Tue, 16 Jun 2015 16:01:33 -0700
Subject: [PATCH] Move res_template from java_staging to java, part 2.

This deletes the now-obsolete files in java_staging/res_template.

BUG=497470

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

Cr-Commit-Position: refs/heads/master@{#334733}
---
 chrome/android/java_staging/res_template/xml/searchable.xml  | 12 ------------
 chrome/android/java_staging/res_template/xml/syncadapter.xml | 11 -----------
 2 files changed, 23 deletions(-)
 delete mode 100644 chrome/android/java_staging/res_template/xml/searchable.xml
 delete mode 100644 chrome/android/java_staging/res_template/xml/syncadapter.xml

diff --git a/chrome/android/java_staging/res_template/xml/searchable.xml b/chrome/android/java_staging/res_template/xml/searchable.xml
deleted file mode 100644
index 7a437465994c..000000000000
--- a/chrome/android/java_staging/res_template/xml/searchable.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 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. -->
-
-<searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:label="@string/app_name"
-    android:includeInGlobalSearch="true"
-    android:searchSettingsDescription="@string/content_provider_search_description"
-    android:searchSuggestAuthority="{{manifest_package}}.browser"
-    android:searchSuggestIntentAction="android.intent.action.VIEW"
-    android:searchSuggestSelection="url LIKE ?" />
diff --git a/chrome/android/java_staging/res_template/xml/syncadapter.xml b/chrome/android/java_staging/res_template/xml/syncadapter.xml
deleted file mode 100644
index a0c78f9fdd56..000000000000
--- a/chrome/android/java_staging/res_template/xml/syncadapter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 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. -->
-
-<!-- The attributes in this XML file provide configuration information -->
-<!-- for the SyncAdapter. -->
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="{{manifest_package}}"
-    android:accountType="com.google" />
-- 
2.11.4.GIT