Upstream some more content/ DEPS-related cleanup.

content/shell/android/java/org/chromium/content_shell/ContentShellActivity.java

 // 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.
 
 package org.chromium.content_shell;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 
-import org.chromium.content.browser.CommandLine;
+import org.chromium.content.app.LibraryLoader;
 import org.chromium.content.browser.ContentView;
-import org.chromium.content.browser.LibraryLoader;
+import org.chromium.content.common.CommandLine;
 
 /**
  * Activity for managing the Content Shell.
  */
 public class ContentShellActivity extends Activity {
 
     private static final String COMMAND_LINE_FILE = "/data/local/content-shell-command-line";
     private static final String TAG = ContentShellActivity.class.getName();
 
     private ShellManager mShellManager;
@@ skipping 68 matching lines @@
      */
     public ShellView getActiveShellView() {
         return mShellManager != null ? mShellManager.getActiveShellView() : null;
     }
 
     private void initializeContentViewResources() {
         ContentView.registerPopupOverlayCornerRadius(0);
         ContentView.registerPopupOverlayResourceId(R.drawable.popup_zoomer_overlay);
     }
 }