Part 2 of reapplying r64637.

chrome_frame/external_tab.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_FRAME_EXTERNAL_TAB_H_
 #define CHROME_FRAME_EXTERNAL_TAB_H_
 #pragma once
 
 #include <windows.h>
 #include <atlbase.h>
 #include <atlwin.h>
 #include <vector>
 #include <string>
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
-#include "chrome/common//page_zoom.h"
-#include "chrome/test/automation/automation_constants.h"
+#include "chrome/common/automation_constants.h"
+#include "chrome/common/page_zoom.h"
 #include "chrome_frame/cfproxy.h"
 #include "chrome_frame/task_marshaller.h"
 #include "googleurl/src/gurl.h"
 
 class Task;
 class CancelableTask;
 namespace base {
   class TimeDelta;
   class WaitableEvent;
 }
@@ skipping 187 matching lines @@
     void Set(const GURL& gurl, const GURL& ref) {
       url = gurl;
       referrer = ref;
     }
   } pending_navigation_;
 
   ScopedComPtr<IInternetSecurityManager> security_manager_;
 };
 
 #endif  // CHROME_FRAME_EXTERNAL_TAB_H_